From eab62acd792f4462c95cb951c2bdc717091364ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 8 Jul 2019 12:02:21 +0100 Subject: [PATCH 001/471] Writes changes to sysconfig interface files --- src/lib/y2network/sysconfig/interface_file.rb | 143 ++++++++++++++++-- .../sysconfig/interface_file_test.rb | 78 +++++++++- 2 files changed, 206 insertions(+), 15 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 7427c7e29..79f3bb7fc 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -42,16 +42,78 @@ def find(name) new(name) end + # Defines a parameter + # + # This method adds a pair of methods to get and set the parameter's value. + # + # @param name [Symbol] Parameter name + # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) def define_parameter(name, type = :string) define_method name do + return @values[name] if @values.key?(name) value = fetch(name.to_s.upcase) send("value_as_#{type}", value) end + + define_method "#{name}=" do |value| + @values[name] = value + end + end + + # Defines an array parameter + # + # This method adds a pair of methods to get and set the parameter's values. + # + # @param name [Symbol] Parameter name + # @param limit [Integer] Maximum array size + # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) + def define_array_parameter(name, limit, type = :string) + define_method "#{name}s" do + return @values[name] if @values.key?(name) + key = name.to_s.upcase + values = [fetch(key)] + values += Array.new(limit) do |idx| + value = fetch("#{key}_#{idx}") + next if value.nil? + send("value_as_#{type}", value) + end + values.compact + end + + define_method "#{name}s=" do |value| + @values[name] = value + end + end + + # Defines an array parameter + # + # This method adds a pair of methods to get and set the parameter's values. + # + # @param name [String] Parameter name + # @param limit [Integer] Maximum array size + # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) + def define_array_parameter(name, limit, type = :string) + define_method "#{name}s" do + key = name.to_s.upcase + values = [fetch(key)] + values += Array.new(limit) do |idx| + value = fetch("#{key}_#{idx}") + next if value.nil? + send("value_as_#{type}", value) + end + values.compact + end + + define_method "#{name}s=" do |value| + @values["#{name}"] = value + end end end attr_reader :name + define_parameter(:ipaddr, :ipaddr) + # !@attribute [r] bootproto # return [Symbol] Set up protocol (:static, :dhcp, :dhcp4, :dhcp6, :autoip, :dhcp+autoip, # :auto6, :6to4, :none) @@ -65,6 +127,11 @@ def define_parameter(name, type = :string) # @return [Integer] Length in bits for all keys used define_parameter(:wireless_key_length, :integer) + # @return [Integer] Number of supported keys + SUPPORTED_KEYS = 4 + + define_array_parameter(:wireless_key, SUPPORTED_KEYS, :string) + # !@attribute [r] wireless_default_key # @return [Integer] Index of the default key # @see #wireless_keys @@ -123,6 +190,16 @@ def define_parameter(name, type = :string) # @param name [String] Interface name def initialize(name) @name = name + @values = {} + end + + SYSCONFIG_NETWORK_PATH = Pathname.new("/etc").join("sysconfig", "network").freeze + + # Returns the file path + # + # @return [Pathname] + def path + SYSCONFIG_NETWORK_PATH.join("ifcfg-#{name}") end # Returns the IP address if defined @@ -132,18 +209,7 @@ def ip_address str = fetch("IPADDR") str.nil? || str.empty? ? nil : IPAddr.new(str) end - - # @return [Integer] Number of supported keys - SUPPORTED_KEYS = 4 - - # List of wireless keys - # - # @return [Array] Wireless keys - def wireless_keys - keys = [fetch("WIRELESS_KEY")] - keys += Array.new(SUPPORTED_KEYS) { |i| fetch("WIRELESS_KEY_#{i}") } - keys.compact - end + alias_method :ip_address, :ipaddr # Fetches a key # @@ -154,6 +220,21 @@ def fetch(key) Yast::SCR.Read(path) end + # Writes the changes to the file + # + # @note Writes only changed values, keeping the rest as they are. + def save + @values.each do |key, value| + normalized_key = key.upcase + if value.is_a?(Array) + write_array(normalized_key, value) + else + write(normalized_key, value) + end + end + Yast::SCR.Write(Yast::Path.new(".network"), nil) + end + # Determines the interface's type # # @todo Borrow logic from https://github.com/yast/yast-yast2/blob/6f7a789d00cd03adf62e00da34720f326f0e0633/library/network/src/modules/NetworkInterfaces.rb#L291 @@ -188,6 +269,44 @@ def value_as_integer(value) def value_as_symbol(value) value.nil? || value.empty? ? nil : value.to_sym end + + # Converts the value into a IPAddr (or nil if empty) + # + # @param [String] value + # @return [IPAddr,nil] + def value_as_ipaddr(value) + value.nil? || value.empty? ? nil : IPAddr.new(value) + end + + # Writes an array as a value for a given key + # + # @param key [Symbol] Key + # @param value [Array<#to_s>] Values to write + def write_array(key, values) + values.each_with_index do |value, idx| + write("#{key}_#{idx}", value) + end + end + + # Writes an array as a value for a given key + # + # @param key [Symbol] Key + # @param value [Array<#to_s>] Values to write + def write_array(key, values) + values.each_with_index do |value, idx| + write("#{key}_#{idx}", value) + end + end + + # Writes the value for a given key + # + # @param key [Symbol] Key + # @param value [#to_s] Value to write + def write(key, value) + raw_value = value ? value.to_s : nil + path = Yast::Path.new(".network.value.\"#{name}\".#{key}") + Yast::SCR.Write(path, raw_value) + end end end end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index a7c7b0e67..2b85b5071 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -19,14 +19,25 @@ require_relative "../../test_helper" require "y2network/sysconfig/interface_file" +require "tmpdir" describe Y2Network::Sysconfig::InterfaceFile do subject(:file) { described_class.new("eth0") } - let(:scr_root) { File.join(DATA_PATH, "scr_read") } + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } around do |example| - change_scr_root(scr_root, &example) + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end end describe ".find" do @@ -47,7 +58,6 @@ it "returns the raw value from the sysconfig file" do expect(file.fetch("IPADDR")).to eq("192.168.123.1/24") end - end describe "#ip_address" do @@ -78,6 +88,13 @@ end end + describe "#ipaddr=" do + it "sets the bootproto" do + expect { file.ipaddr = IPAddr.new("10.0.0.1") } + .to change { file.ipaddr }.to(IPAddr.new("10.0.0.1")) + end + end + describe "#bootproto" do let(:bootproto) { "static" } @@ -86,6 +103,12 @@ end end + describe "#bootproto=" do + it "sets the bootproto" do + expect { file.bootproto = :dhcp }.to change { file.bootproto }.from(:static).to(:dhcp) + end + end + describe "#startmode" do let(:startmode) { "auto" } @@ -94,6 +117,12 @@ end end + describe "#startmode=" do + it "sets the startmode" do + expect { file.startmode = :manual }.to change { file.startmode }.from(:auto).to(:manual) + end + end + describe "#wireless_keys" do subject(:file) { described_class.new("wlan0") } @@ -101,4 +130,47 @@ expect(file.wireless_keys).to eq(["0-1-2-3-4-5", "s:password"]) end end + + describe "#wireless_keys=" do + let(:keys) { ["123456", "abcdef"] } + + it "sets the wireless keys" do + expect { file.wireless_keys = keys }.to change { file.wireless_keys }.to(keys) + end + end + + describe "#save" do + subject(:file) { described_class.new("eth0") } + + it "writes the changes to the file" do + file.ipaddr = IPAddr.new("192.168.122.1") + file.bootproto = :static + file.save + + content = file_content(scr_root, file) + expect(content).to include("BOOTPROTO='static'") + expect(content).to include("IPADDR='192.168.122.1'") + end + + describe "when multiple wireless keys are specified" do + it "writes indexes keys" do + file.wireless_keys = [ "123456", "abcdef" ] + file.save + + content = file_content(scr_root, file) + expect(content).to include("WIRELESS_KEY_0='123456") + expect(content).to include("WIRELESS_KEY_1='abcdef") + end + end + + describe "when a nil value is specified" do + it "removes the key from the value" do + file.bootproto = nil + file.save + + content = file_content(scr_root, file) + expect(content).to_not include("BOOTPROTO") + end + end + end end From 4bee3fd3dcbc6416d5a447f0754151dac0582c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 8 Jul 2019 16:18:09 +0100 Subject: [PATCH 002/471] Add support to write ethernet connections configurations --- src/lib/y2network/sysconfig/config_writer.rb | 12 ++++ .../sysconfig/connection_config_writer.rb | 54 ++++++++++++++ .../connection_config_writers/eth.rb | 43 ++++++++++++ src/lib/y2network/sysconfig/interface_file.rb | 5 +- .../y2network/sysconfig/config_writer_test.rb | 24 ++++++- .../connection_config_writer_test.rb | 70 +++++++++++++++++++ .../connection_config_writers/eth_test.rb | 51 ++++++++++++++ .../sysconfig/interface_file_test.rb | 2 +- 8 files changed, 255 insertions(+), 6 deletions(-) create mode 100644 src/lib/y2network/sysconfig/connection_config_writer.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/eth.rb create mode 100644 test/y2network/sysconfig/connection_config_writer_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/eth_test.rb diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 3d21274f5..9bc16d314 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -21,6 +21,7 @@ require "y2network/sysconfig_paths" require "y2network/sysconfig/routes_file" require "y2network/sysconfig/dns_writer" +require "y2network/sysconfig/connection_config_writer" module Y2Network module Sysconfig @@ -56,6 +57,7 @@ def write(config, old_config = nil) file.save write_dns_settings(config, old_config) + write_connections(config.connections) end private @@ -147,6 +149,16 @@ def write_dns_settings(config, old_config) writer = Y2Network::Sysconfig::DNSWriter.new writer.write(config.dns, old_dns) end + + # Writes connections configuration + # + # @todo Handle old connections (removing those that are needed, etc.) + # + # @param conns [Array] Connections to write + def write_connections(conns) + writer = Y2Network::Sysconfig::ConnectionConfigWriter.new + conns.each { |c| writer.write(c) } + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb new file mode 100644 index 000000000..67588f6d6 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -0,0 +1,54 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/interface_file" + +module Y2Network + module Sysconfig + class ConnectionConfigWriter + include Yast::Logger + + # Writes connection config to the underlying system + # + # @param conn [Y2Network::ConnectionConfig::Base] Connection configuration to write + def write(conn) + file = Y2Network::Sysconfig::InterfaceFile.new(conn.interface) + handler_class = find_handler_class(conn.type.short_name) + return nil if handler_class.nil? + handler_class.new(file).write(conn) + file.save + end + + private + + # Returns the class to handle a given interface type + # + # @param type [Symbol] + # @return [Class] A class which belongs to the ConnectionConfigWriters module + def find_handler_class(type) + require "y2network/sysconfig/connection_config_writers/#{type}" + ConnectionConfigWriters.const_get(type.to_s.capitalize) + rescue LoadError, NameError => e + log.info "Unknown connection type: '#{type}'. " \ + "Connection handler could not be loaded: #{e.message}" + nil + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/eth.rb b/src/lib/y2network/sysconfig/connection_config_writers/eth.rb new file mode 100644 index 000000000..3f2420313 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/eth.rb @@ -0,0 +1,43 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Ethernet + # object to the underlying system. + class Eth + # @return [Y2Network::Sysconfig::InterfaceFile] + attr_reader :file + + def initialize(file) + @file = file + end + + # Writes connection information to the interface configuration file + # + # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write + def write(conn) + file.bootproto = conn.bootproto + file.ipaddr = conn.ip_address + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 79f3bb7fc..ef73e40ad 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -89,11 +89,12 @@ def define_array_parameter(name, limit, type = :string) # # This method adds a pair of methods to get and set the parameter's values. # - # @param name [String] Parameter name + # @param name [Symbol] Parameter name # @param limit [Integer] Maximum array size # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) def define_array_parameter(name, limit, type = :string) define_method "#{name}s" do + return @values[name] if @values.key?(name) key = name.to_s.upcase values = [fetch(key)] values += Array.new(limit) do |idx| @@ -105,7 +106,7 @@ def define_array_parameter(name, limit, type = :string) end define_method "#{name}s=" do |value| - @values["#{name}"] = value + @values[name] = value end end end diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 3cff42c62..285c3d1d7 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -24,6 +24,7 @@ require "y2network/route" require "y2network/routing_table" require "y2network/sysconfig_paths" +require "y2network/connection_config/ethernet" describe Y2Network::Sysconfig::ConfigWriter do subject(:writer) { described_class.new } @@ -31,13 +32,22 @@ describe "#write" do let(:config) do Y2Network::Config.new( - interfaces: [eth0], - routing: routing, - source: :sysconfig + interfaces: [eth0], + connections: [eth0_conn], + routing: routing, + source: :sysconfig ) end let(:old_config) { instance_double(Y2Network::Config, dns: double("dns")) } + let(:eth0) { Y2Network::Interface.new("eth0") } + let(:eth0_conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| + conn.interface = "eth0" + conn.bootproto = :static, + conn.ip_address = IPAddr.new("192.168.122.1") + end + end let(:route) do Y2Network::Route.new( to: IPAddr.new("10.0.0.2/8"), @@ -71,6 +81,7 @@ let(:routes) { [route, default_route] } let(:dns_writer) { instance_double(Y2Network::Sysconfig::DNSWriter, write: nil) } + let(:conn_writer) { instance_double(Y2Network::Sysconfig::ConnectionConfigWriter, write: nil) } before do allow(Y2Network::Sysconfig::RoutesFile).to receive(:new) @@ -81,6 +92,8 @@ .and_return(routes_file) allow(Y2Network::Sysconfig::DNSWriter).to receive(:new) .and_return(dns_writer) + allow(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:new) + .and_return(conn_writer) end it "saves general routes to main routes file" do @@ -152,5 +165,10 @@ expect(dns_writer).to receive(:write).with(config.dns, old_config.dns) writer.write(config, old_config) end + + it "writes connections configurations" do + expect(conn_writer).to receive(:write).with(eth0_conn) + writer.write(config, old_config) + end end end diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/sysconfig/connection_config_writer_test.rb new file mode 100644 index 000000000..13167afbf --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writer_test.rb @@ -0,0 +1,70 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "y2network/sysconfig/connection_config_writer" +require "y2network/sysconfig/connection_config_writers/eth" +require "y2network/connection_config/ethernet" +require "y2network/interface_type" + +describe Y2Network::Sysconfig::ConnectionConfigWriter do + subject(:writer) { described_class.new } + + describe "#write" do + let(:handler) do + instance_double( + Y2Network::Sysconfig::ConnectionConfigWriters::Eth, + write: nil + ) + end + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Ethernet, + interface: "eth0", + type: Y2Network::InterfaceType::ETHERNET + ) + end + + let(:file) do + instance_double( + Y2Network::Sysconfig::InterfaceFile, save: nil + ) + end + + before do + allow(writer).to receive(:require).and_call_original + allow(Y2Network::Sysconfig::ConnectionConfigWriters::Eth).to receive(:new) + .and_return(handler) + allow(Y2Network::Sysconfig::InterfaceFile).to receive(:new).and_return(file) + end + + it "uses the appropiate handler" do + expect(writer).to receive(:require).and_return(handler) + expect(handler).to receive(:write).with(conn) + writer.write(conn) + end + + it "writes changes to the file" do + expect(file).to receive(:save) + writer.write(conn) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/eth_test.rb b/test/y2network/sysconfig/connection_config_writers/eth_test.rb new file mode 100644 index 000000000..6d9f6c470 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/eth_test.rb @@ -0,0 +1,51 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/eth" +require "y2network/sysconfig/interface_file" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Eth do + subject(:writer) { described_class.new(file) } + + let(:address) { IPAddr.new("192.168.122.1") } + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Ethernet, + interface: "eth0", bootproto: :static, ip_address: address + ) + end + let(:file) do + instance_double(Y2Network::Sysconfig::InterfaceFile) + end + + before do + allow(Y2Network::Sysconfig::InterfaceFile) + .to receive(:new).and_return(file) + end + + describe "#write" do + it "updates ethernet related properties" do + expect(file).to receive(:bootproto=).with(:static) + expect(file).to receive(:ipaddr=).with(address) + writer.write(conn) + end + end +end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 2b85b5071..73ac52a6b 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -132,7 +132,7 @@ def file_content(scr_root, file) end describe "#wireless_keys=" do - let(:keys) { ["123456", "abcdef"] } + let(:keys) { [ "123456", "abcdef" ] } it "sets the wireless keys" do expect { file.wireless_keys = keys }.to change { file.wireless_keys }.to(keys) From 7ad8c54e9e02af015a741d42c4f3b6524444ad74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 8 Jul 2019 16:43:40 +0100 Subject: [PATCH 003/471] Make RuboCop happy --- test/y2network/sysconfig/config_writer_test.rb | 2 +- test/y2network/sysconfig/connection_config_writer_test.rb | 2 +- test/y2network/sysconfig/interface_file_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 285c3d1d7..8ba39d2ad 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -44,7 +44,7 @@ let(:eth0_conn) do Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| conn.interface = "eth0" - conn.bootproto = :static, + conn.bootproto = :static conn.ip_address = IPAddr.new("192.168.122.1") end end diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/sysconfig/connection_config_writer_test.rb index 13167afbf..c98651be7 100644 --- a/test/y2network/sysconfig/connection_config_writer_test.rb +++ b/test/y2network/sysconfig/connection_config_writer_test.rb @@ -39,7 +39,7 @@ instance_double( Y2Network::ConnectionConfig::Ethernet, interface: "eth0", - type: Y2Network::InterfaceType::ETHERNET + type: Y2Network::InterfaceType::ETHERNET ) end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 73ac52a6b..01b0f86ce 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -154,7 +154,7 @@ def file_content(scr_root, file) describe "when multiple wireless keys are specified" do it "writes indexes keys" do - file.wireless_keys = [ "123456", "abcdef" ] + file.wireless_keys = ["123456", "abcdef"] file.save content = file_content(scr_root, file) From acfa65480592af3c90a1a355098b2dd5f8923b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 9 Jul 2019 12:22:03 +0100 Subject: [PATCH 004/471] Add missing #startmode{,=} method to ConnectionConfig::Base --- src/lib/y2network/connection_config/base.rb | 5 ++++- src/lib/y2network/sysconfig/connection_config_writers/eth.rb | 1 + .../sysconfig/connection_config_writers/eth_test.rb | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index cbf5da282..207e60a59 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -32,7 +32,10 @@ class Base # # @return [Interface, nil] attr_accessor :interface - # @return [String] Bootproto (static, dhcp, ,dhcp4, dhcp6, autoip, + # @return [Symbol] Choose when the interface should be set up (manual, auto, nfsroot, hotplug, + # off) + attr_accessor :startmode + # @return [Symbol] Bootproto (static, dhcp, ,dhcp4, dhcp6, autoip, # dhcp+autoip, auto6, 6to4, none) attr_accessor :bootproto # @return [IPAddr,nil] diff --git a/src/lib/y2network/sysconfig/connection_config_writers/eth.rb b/src/lib/y2network/sysconfig/connection_config_writers/eth.rb index 3f2420313..12dc8cda4 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/eth.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/eth.rb @@ -34,6 +34,7 @@ def initialize(file) # # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write def write(conn) + file.startmode = conn.startmode file.bootproto = conn.bootproto file.ipaddr = conn.ip_address end diff --git a/test/y2network/sysconfig/connection_config_writers/eth_test.rb b/test/y2network/sysconfig/connection_config_writers/eth_test.rb index 6d9f6c470..fa7877cac 100644 --- a/test/y2network/sysconfig/connection_config_writers/eth_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/eth_test.rb @@ -29,7 +29,7 @@ let(:conn) do instance_double( Y2Network::ConnectionConfig::Ethernet, - interface: "eth0", bootproto: :static, ip_address: address + interface: "eth0", bootproto: :static, ip_address: address, startmode: :auto ) end let(:file) do @@ -45,6 +45,7 @@ it "updates ethernet related properties" do expect(file).to receive(:bootproto=).with(:static) expect(file).to receive(:ipaddr=).with(address) + expect(file).to receive(:startmode=).with(:auto) writer.write(conn) end end From 7291b17dc021837957ff66239f5044c22554029f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 9 Jul 2019 13:10:11 +0100 Subject: [PATCH 005/471] Add support to write wireless configuration --- .../connection_config_writers/wlan.rb | 92 ++++++++++++++ .../connection_config_writers/wlan_test.rb | 115 ++++++++++++++++++ 2 files changed, 207 insertions(+) create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/wlan.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/wlan_test.rb diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb b/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb new file mode 100644 index 000000000..137958220 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb @@ -0,0 +1,92 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Wireless + # object to the underlying system. + class Wlan + # @return [Y2Network::Sysconfig::InterfaceFile] + attr_reader :file + + def initialize(file) + @file = file + end + + # Writes connection information to the interface configuration file + # + # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write + def write(conn) + file.startmode = conn.startmode + file.bootproto = conn.bootproto + file.ipaddr = conn.ip_address + file.wireless_ap = conn.ap + file.wireless_ap_scanmode = conn.ap_scanmode + file.wireless_essid = conn.essid + file.wireless_mode = conn.mode + file.wireless_nwid = conn.nwid + write_auth_settings(conn) if conn.auth_mode + file + end + + private + + # Writes authentication settings + # + # This method relies in `write_*_auth_settings` methods. + # + # + # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write + # + # @see #write_eap_auth_settings + # @see #write_psk_auth_settings + # @see #write_shared_auth_settings + def write_auth_settings(conn) + file.wireless_auth_mode = conn.auth_mode || :open + meth = "write_#{conn.auth_mode}_auth_settings".to_sym + send(meth, conn) if respond_to?(meth, true) + end + + # Writes autentication settings for WPA-EAP networks + # + # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write + def write_eap_auth_settings(conn) + file.wireless_eap_mode = conn.eap_mode + file.wireless_wpa_password = conn.wpa_password + end + + # Writes autentication settings for WPA-PSK networks + # + # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write + def write_psk_auth_settings(conn) + file.wireless_wpa_psk = conn.wpa_psk + end + + # Writes autentication settings for WEP networks + # + # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write + def write_shared_auth_settings(conn) + file.wireless_keys = conn.keys + file.wireless_key_length = conn.key_length + file.wireless_default_key = conn.default_key + end + end + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/wlan_test.rb b/test/y2network/sysconfig/connection_config_writers/wlan_test.rb new file mode 100644 index 000000000..f7ae2fc92 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/wlan_test.rb @@ -0,0 +1,115 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_writers/wlan" +require "y2network/sysconfig/interface_file" +require "y2network/connection_config/wireless" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Wlan do + subject(:handler) { described_class.new(file) } + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new("wlan0") } + let(:conn) do + Y2Network::ConnectionConfig::Wireless.new.tap do |conn| + conn.startmode = :auto + conn.bootproto = :static + conn.ip_address = address + conn.mode = "managed" + conn.essid = "example_essid" + conn.auth_mode = :open + conn.ap = "00:11:22:33:44:55" + conn.ap_scanmode = "1" + end + end + let(:address) { IPAddr.new("192.168.122.100") } + + it "sets relevant attributes" do + handler.write(conn) + expect(file).to have_attributes( + startmode: :auto, + bootproto: :static, + ipaddr: address, + wireless_mode: conn.mode, + wireless_essid: conn.essid, + wireless_auth_mode: :open, + wireless_ap: conn.ap, + wireless_ap_scanmode: conn.ap_scanmode + ) + end + + context "WPA-EAP network configuration" do + let(:conn) do + Y2Network::ConnectionConfig::Wireless.new.tap do |conn| + conn.auth_mode = "eap" + conn.eap_mode = "PEAP" + conn.essid = "example_essid" + conn.wpa_password = "example_passwd" + end + end + + it "sets relevant attributes" do + handler.write(conn) + expect(file).to have_attributes( + wireless_auth_mode: "eap", + wireless_eap_mode: "PEAP", + wireless_essid: "example_essid", + wireless_wpa_password: "example_passwd" + ) + end + end + + context "WPA-PSK network configuration" do + let(:conn) do + Y2Network::ConnectionConfig::Wireless.new.tap do |conn| + conn.auth_mode = "psk" + conn.wpa_psk = "example_psk" + end + end + + it "sets relevant attributes" do + handler.write(conn) + expect(file).to have_attributes( + wireless_auth_mode: "psk", + wireless_wpa_psk: "example_psk" + ) + end + end + + context "WEP network configuration" do + let(:conn) do + Y2Network::ConnectionConfig::Wireless.new.tap do |conn| + conn.auth_mode = "shared" + conn.keys = ["123456", "abcdef"] + conn.key_length = 128 + conn.default_key = 1 + end + end + + it "sets relevant attributes" do + handler.write(conn) + expect(file).to have_attributes( + wireless_auth_mode: "shared", + wireless_keys: ["123456", "abcdef"], + wireless_key_length: 128, + wireless_default_key: 1 + ) + end + end +end From 3babb794c458895d8c3e7ff622edfa52233a3f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 9 Jul 2019 15:06:11 +0100 Subject: [PATCH 006/471] Removes old values from ifcfg-* files before writing --- .../sysconfig/connection_config_writer.rb | 1 + src/lib/y2network/sysconfig/interface_file.rb | 28 ++++++++++++------- .../connection_config_writer_test.rb | 5 ++-- .../sysconfig/interface_file_test.rb | 14 +++++++++- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index 67588f6d6..e68541fa3 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -31,6 +31,7 @@ def write(conn) file = Y2Network::Sysconfig::InterfaceFile.new(conn.interface) handler_class = find_handler_class(conn.type.short_name) return nil if handler_class.nil? + file.clean handler_class.new(file).write(conn) file.save end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index ef73e40ad..caab9b70e 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -49,6 +49,8 @@ def find(name) # @param name [Symbol] Parameter name # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) def define_parameter(name, type = :string) + params << name + define_method name do return @values[name] if @values.key?(name) value = fetch(name.to_s.upcase) @@ -85,6 +87,15 @@ def define_array_parameter(name, limit, type = :string) end end + # Known configuration attributes/parameters + # + # A parameter is defined by using {define_parameter} or {define_array_parameter} methods. + # + # @return [Array] + def params + @params ||= [] + end + # Defines an array parameter # # This method adds a pair of methods to get and set the parameter's values. @@ -245,6 +256,13 @@ def type :eth end + # Empties all known values + # + # This idea is to use this method to clear all unneeded values from interface files. + def clean + @values = self.class.params.each_with_object({}) { |e, h| h[e] = nil } + end + private # Converts the value into a string (or nil if empty) @@ -289,16 +307,6 @@ def write_array(key, values) end end - # Writes an array as a value for a given key - # - # @param key [Symbol] Key - # @param value [Array<#to_s>] Values to write - def write_array(key, values) - values.each_with_index do |value, idx| - write("#{key}_#{idx}", value) - end - end - # Writes the value for a given key # # @param key [Symbol] Key diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/sysconfig/connection_config_writer_test.rb index c98651be7..cd90f11d5 100644 --- a/test/y2network/sysconfig/connection_config_writer_test.rb +++ b/test/y2network/sysconfig/connection_config_writer_test.rb @@ -45,7 +45,7 @@ let(:file) do instance_double( - Y2Network::Sysconfig::InterfaceFile, save: nil + Y2Network::Sysconfig::InterfaceFile, save: nil, clean: nil ) end @@ -62,7 +62,8 @@ writer.write(conn) end - it "writes changes to the file" do + it "cleans old values and writes new ones" do + expect(file).to receive(:clean) expect(file).to receive(:save) writer.write(conn) end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 01b0f86ce..69878d6f4 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -132,7 +132,7 @@ def file_content(scr_root, file) end describe "#wireless_keys=" do - let(:keys) { [ "123456", "abcdef" ] } + let(:keys) { ["123456", "abcdef"] } it "sets the wireless keys" do expect { file.wireless_keys = keys }.to change { file.wireless_keys }.to(keys) @@ -173,4 +173,16 @@ def file_content(scr_root, file) end end end + + describe "#clean" do + subject(:file) { described_class.new("eth0") } + + it "removes all known values from the file" do + file.clean + file.save + + content = file_content(scr_root, file) + expect(content).to include("BROADCAST=''") + end + end end From 9d5fd02c5cfaa40f6f99346a6c4264bdf23fb810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 9 Jul 2019 15:16:57 +0100 Subject: [PATCH 007/471] Remove duplicated code --- src/lib/y2network/sysconfig/interface_file.rb | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index caab9b70e..0846886ea 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -95,31 +95,6 @@ def define_array_parameter(name, limit, type = :string) def params @params ||= [] end - - # Defines an array parameter - # - # This method adds a pair of methods to get and set the parameter's values. - # - # @param name [Symbol] Parameter name - # @param limit [Integer] Maximum array size - # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) - def define_array_parameter(name, limit, type = :string) - define_method "#{name}s" do - return @values[name] if @values.key?(name) - key = name.to_s.upcase - values = [fetch(key)] - values += Array.new(limit) do |idx| - value = fetch("#{key}_#{idx}") - next if value.nil? - send("value_as_#{type}", value) - end - values.compact - end - - define_method "#{name}s=" do |value| - @values[name] = value - end - end end attr_reader :name From c54701bd37b3e7c1c22735569670fb6fce5349aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 9 Jul 2019 15:17:06 +0100 Subject: [PATCH 008/471] Rename InterfaceFile#name to InterfaceFile#interface * Resolves a conflict between InterfaceFile#name and the NAME parameter. --- src/lib/y2network/connection_config/base.rb | 2 + .../connection_config_readers/eth.rb | 3 +- .../connection_config_readers/wlan.rb | 7 +- .../connection_config_writers/eth.rb | 3 +- .../connection_config_writers/wlan.rb | 3 +- src/lib/y2network/sysconfig/interface_file.rb | 67 ++++++++++--------- .../connection_config_readers/eth_test.rb | 3 +- .../connection_config_readers/wlan_test.rb | 15 +++-- .../connection_config_writers/eth_test.rb | 21 +++--- .../sysconfig/interface_file_test.rb | 2 +- 10 files changed, 73 insertions(+), 53 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 207e60a59..9f076b0e9 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -44,6 +44,8 @@ class Base attr_accessor :secondary_ip_addresses # @return [Integer, nil] attr_accessor :mtu + # @return [String] Connection's description (e.g., "Ethernet Card 0") + attr_accessor :description # Returns the connection type # diff --git a/src/lib/y2network/sysconfig/connection_config_readers/eth.rb b/src/lib/y2network/sysconfig/connection_config_readers/eth.rb index ca0280947..027b1ccc6 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/eth.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/eth.rb @@ -38,8 +38,9 @@ def initialize(file) # @return [Y2Network::ConnectionConfig::Ethernet] def connection_config Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| - conn.interface = file.name conn.bootproto = file.bootproto + conn.description = file.name + conn.interface = file.interface conn.ip_address = file.ip_address end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wlan.rb b/src/lib/y2network/sysconfig/connection_config_readers/wlan.rb index 372e6a41e..bc641784a 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wlan.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wlan.rb @@ -37,16 +37,17 @@ def initialize(file) # @return [ConnectionConfig::Wireless] def connection_config Y2Network::ConnectionConfig::Wireless.new.tap do |conn| - conn.interface = file.name - conn.bootproto = file.bootproto - conn.ip_address = file.ip_address conn.ap = file.wireless_ap conn.ap_scanmode = file.wireless_ap_scanmode conn.auth_mode = file.wireless_auth_mode + conn.bootproto = file.bootproto conn.default_key = file.wireless_default_key + conn.description = file.name conn.eap_auth = file.wireless_eap_auth conn.eap_mode = file.wireless_eap_mode conn.essid = file.wireless_essid + conn.interface = file.interface + conn.ip_address = file.ip_address conn.key_length = file.wireless_key_length conn.keys = file.wireless_keys conn.mode = file.wireless_mode diff --git a/src/lib/y2network/sysconfig/connection_config_writers/eth.rb b/src/lib/y2network/sysconfig/connection_config_writers/eth.rb index 12dc8cda4..ca78397ee 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/eth.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/eth.rb @@ -34,9 +34,10 @@ def initialize(file) # # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write def write(conn) - file.startmode = conn.startmode file.bootproto = conn.bootproto file.ipaddr = conn.ip_address + file.name = conn.description + file.startmode = conn.startmode end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb b/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb index 137958220..8379a007f 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb @@ -33,9 +33,10 @@ def initialize(file) # # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write def write(conn) - file.startmode = conn.startmode file.bootproto = conn.bootproto file.ipaddr = conn.ip_address + file.name = conn.description + file.startmode = conn.startmode file.wireless_ap = conn.ap file.wireless_ap_scanmode = conn.ap_scanmode file.wireless_essid = conn.essid diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 0846886ea..e11fe3fee 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -35,30 +35,30 @@ class << self # Finds the ifcfg-* file for a given interface # - # @param name [String] Interface name + # @param interface [String] Interface name # @return [Sysconfig::InterfaceFile,nil] Sysconfig - def find(name) - return nil unless Yast::FileUtils.Exists(SYSCONFIG_NETWORK_DIR.join("ifcfg-#{name}").to_s) - new(name) + def find(interface) + return nil unless Yast::FileUtils.Exists(SYSCONFIG_NETWORK_DIR.join("ifcfg-#{interface}").to_s) + new(interface) end # Defines a parameter # # This method adds a pair of methods to get and set the parameter's value. # - # @param name [Symbol] Parameter name - # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) - def define_parameter(name, type = :string) - params << name - - define_method name do - return @values[name] if @values.key?(name) - value = fetch(name.to_s.upcase) + # @param param_name [Symbol] Parameter name + # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) + def define_parameter(param_name, type = :string) + params << param_name + + define_method param_name do + return @values[param_name] if @values.key?(param_name) + value = fetch(param_name.to_s.upcase) send("value_as_#{type}", value) end - define_method "#{name}=" do |value| - @values[name] = value + define_method "#{param_name}=" do |value| + @values[param_name] = value end end @@ -66,13 +66,13 @@ def define_parameter(name, type = :string) # # This method adds a pair of methods to get and set the parameter's values. # - # @param name [Symbol] Parameter name - # @param limit [Integer] Maximum array size - # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) - def define_array_parameter(name, limit, type = :string) - define_method "#{name}s" do - return @values[name] if @values.key?(name) - key = name.to_s.upcase + # @param param_name [Symbol] Parameter name + # @param limit [Integer] Maximum array size + # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) + def define_array_parameter(param_name, limit, type = :string) + define_method "#{param_name}s" do + return @values[param_name] if @values.key?(param_name) + key = param_name.to_s.upcase values = [fetch(key)] values += Array.new(limit) do |idx| value = fetch("#{key}_#{idx}") @@ -82,8 +82,8 @@ def define_array_parameter(name, limit, type = :string) values.compact end - define_method "#{name}s=" do |value| - @values[name] = value + define_method "#{param_name}s=" do |value| + @values[param_name] = value end end @@ -97,10 +97,17 @@ def params end end - attr_reader :name + # @return [String] Interface's name + attr_reader :interface + # !@attribute [r] ipaddr + # return [IPAddr] IP address define_parameter(:ipaddr, :ipaddr) + # !@attribute [r] name + # return [String] Interface's description (e.g., "Ethernet Card 0") + define_parameter(:name, :string) + # !@attribute [r] bootproto # return [Symbol] Set up protocol (:static, :dhcp, :dhcp4, :dhcp6, :autoip, :dhcp+autoip, # :auto6, :6to4, :none) @@ -174,9 +181,9 @@ def params # Constructor # - # @param name [String] Interface name - def initialize(name) - @name = name + # @param interface [String] Interface interface + def initialize(interface) + @interface = interface @values = {} end @@ -186,7 +193,7 @@ def initialize(name) # # @return [Pathname] def path - SYSCONFIG_NETWORK_PATH.join("ifcfg-#{name}") + SYSCONFIG_NETWORK_PATH.join("ifcfg-#{interface}") end # Returns the IP address if defined @@ -203,7 +210,7 @@ def ip_address # @param key [String] Interface key # @return [Object] Value for the given key def fetch(key) - path = Yast::Path.new(".network.value.\"#{name}\".#{key}") + path = Yast::Path.new(".network.value.\"#{interface}\".#{key}") Yast::SCR.Read(path) end @@ -288,7 +295,7 @@ def write_array(key, values) # @param value [#to_s] Value to write def write(key, value) raw_value = value ? value.to_s : nil - path = Yast::Path.new(".network.value.\"#{name}\".#{key}") + path = Yast::Path.new(".network.value.\"#{interface}\".#{key}") Yast::SCR.Write(path, raw_value) end end diff --git a/test/y2network/sysconfig/connection_config_readers/eth_test.rb b/test/y2network/sysconfig/connection_config_readers/eth_test.rb index b9eb124bc..a5a49927d 100644 --- a/test/y2network/sysconfig/connection_config_readers/eth_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/eth_test.rb @@ -29,7 +29,8 @@ let(:file) do instance_double( Y2Network::Sysconfig::InterfaceFile, - name: "eth0", + interface: "eth0", + name: "Ethernet Card 0", bootproto: :static, ip_address: address ) diff --git a/test/y2network/sysconfig/connection_config_readers/wlan_test.rb b/test/y2network/sysconfig/connection_config_readers/wlan_test.rb index 655c49c19..124560764 100644 --- a/test/y2network/sysconfig/connection_config_readers/wlan_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/wlan_test.rb @@ -29,7 +29,8 @@ let(:file) do instance_double( Y2Network::Sysconfig::InterfaceFile, - name: "wlan0", + interface: "wlan0", + name: "Wireless Card 0", startmode: :auto, bootproto: :static, ip_address: address, @@ -43,7 +44,8 @@ let(:file) do instance_double( Y2Network::Sysconfig::InterfaceFile, - name: "wlan0", + interface: "wlan0", + name: "Wireless Card 0", bootproto: :static, ip_address: address, wireless_auth_mode: "eap", @@ -88,7 +90,8 @@ let(:file) do instance_double( Y2Network::Sysconfig::InterfaceFile, - name: "wlan0", + interface: "wlan0", + name: "Wireless Card 0", bootproto: :static, wireless_ap: "00:11:22:33:44:55", wireless_auth_mode: "psk", @@ -116,7 +119,8 @@ let(:file) do instance_double( Y2Network::Sysconfig::InterfaceFile, - name: "wlan0", + interface: "wlan0", + name: "Wireless Card 0", bootproto: :static, ip_address: address, wireless_auth_mode: "shared", @@ -148,7 +152,8 @@ let(:file) do instance_double( Y2Network::Sysconfig::InterfaceFile, - name: "wlan0", + interface: "wlan0", + name: "Wireless Card 0", wireless_auth_mode: :open, wireless_mode: :managed ).as_null_object diff --git a/test/y2network/sysconfig/connection_config_writers/eth_test.rb b/test/y2network/sysconfig/connection_config_writers/eth_test.rb index fa7877cac..1ed5d925e 100644 --- a/test/y2network/sysconfig/connection_config_writers/eth_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/eth_test.rb @@ -25,27 +25,28 @@ describe Y2Network::Sysconfig::ConnectionConfigWriters::Eth do subject(:writer) { described_class.new(file) } - let(:address) { IPAddr.new("192.168.122.1") } let(:conn) do instance_double( Y2Network::ConnectionConfig::Ethernet, - interface: "eth0", bootproto: :static, ip_address: address, startmode: :auto + interface: "eth0", + description: "Ethernet Card 0", + bootproto: :static, + ip_address: IPAddr.new("192.168.122.1"), + startmode: :auto ) end - let(:file) do - instance_double(Y2Network::Sysconfig::InterfaceFile) - end + let(:file) { instance_double(Y2Network::Sysconfig::InterfaceFile) } before do - allow(Y2Network::Sysconfig::InterfaceFile) - .to receive(:new).and_return(file) + allow(Y2Network::Sysconfig::InterfaceFile).to receive(:new).and_return(file) end describe "#write" do it "updates ethernet related properties" do - expect(file).to receive(:bootproto=).with(:static) - expect(file).to receive(:ipaddr=).with(address) - expect(file).to receive(:startmode=).with(:auto) + expect(file).to receive(:name=).with(conn.description) + expect(file).to receive(:bootproto=).with(conn.bootproto) + expect(file).to receive(:ipaddr=).with(conn.ip_address) + expect(file).to receive(:startmode=).with(conn.startmode) writer.write(conn) end end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 69878d6f4..47d5cd267 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -44,7 +44,7 @@ def file_content(scr_root, file) it "returns an object representing the file" do file = described_class.find("eth0") expect(file).to be_a(described_class) - expect(file.name).to eq("eth0") + expect(file.interface).to eq("eth0") end context "when a file for the given interface does not exist" do From 8a86fdfd4cf1f6c90ba3ce5157184e3dd15bce44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 9 Jul 2019 15:37:11 +0100 Subject: [PATCH 009/471] Small internal documentation fix --- src/lib/y2network/sysconfig/interface_file.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index e11fe3fee..e7a76acab 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -281,8 +281,8 @@ def value_as_ipaddr(value) # Writes an array as a value for a given key # - # @param key [Symbol] Key - # @param value [Array<#to_s>] Values to write + # @param key [Symbol] Key + # @param values [Array<#to_s>] Values to write def write_array(key, values) values.each_with_index do |value, idx| write("#{key}_#{idx}", value) @@ -291,7 +291,7 @@ def write_array(key, values) # Writes the value for a given key # - # @param key [Symbol] Key + # @param key [Symbol] Key # @param value [#to_s] Value to write def write(key, value) raw_value = value ? value.to_s : nil From a4ccd70ee2d6f0fbd307ca77da1641bac19b81b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 08:59:40 +0100 Subject: [PATCH 010/471] Update network-ng documentation --- doc/network-ng.md | 66 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/doc/network-ng.md b/doc/network-ng.md index 6516894b6..3303d86c0 100644 --- a/doc/network-ng.md +++ b/doc/network-ng.md @@ -40,29 +40,73 @@ other classes. ## Backend Support -In order to support a new backend, we need to implement a configuration readers and writers. The -{Y2Network::Sysconfig} module implements support to deal with `sysconfig` files. +As mentioned above, Y2Network is designed to support different backends. It is expected to implement +a reader and a writer for each backend (except for AutoYaST, which is an special case). The reader +will be responsible for checking the system's configuration and building a {Y2Network::Config} +object, containing interfaces, configurations, routes, etc. On the other hand, the writer will be +responsible for updating the system using that configuration object. + +As a developer, you rarely will need to access to readers/writers because `Yast::Lan` already offers +an API to read and write the configuration. See the [Accessing the +Configuration](#accessing-the-configuration) section for further details. + +### Sysconfig + +The sysconfig backend support is composed by these files: src/lib/y2network/sysconfig ├── config_reader.rb <- READER ├── config_writer.rb <- WRITER - ├── connection_config_reader_handlers - │ ├── eth.rb - │ ├── wlan.rb - │ └── ... ├── connection_config_reader.rb + ├── connection_config_readers + │   ├── eth.rb + │   └── wlan.rb + ├── connection_config_writer.rb + ├── connection_config_writers + │   ├── eth.rb + │   └── wlan.rb ├── dns_reader.rb ├── dns_writer.rb ├── interface_file.rb ├── interfaces_reader.rb - ├── interfaces_writer.rb └── routes_file.rb -As you can see, there are many classes, but the relevant ones are just `ConfigReader` and `ConfigWriter`. +{Y2Network::Sysconfig::ConfigReader} and {Y2Network::Sysconfig::ConfigWriter} are the reader and +writer classes. Each of them cooperates with a set of ancillary classes in order to get the job +done. + +{Y2Network::Sysconfig::DNSReader}, {Y2Network::Sysconfig::InterfacesReader} and +{Y2Network::Sysconfig::ConnectionConfigReader} are involved in reading the configuration. The logic +to read the configuration for a connection (e.g., `ifcfg-eth0`, `ifcfg-wlan0`, etc.) is implemented +in a set of smaller classes (one for each time of connection) under +{Y2Network::Sysconfig::ConnectionConfigReaders}. + +{Y2Network::Sysconfig::DNSWriter} and {Y2Network::Sysconfig::ConnectionConfigWriter}, including +smaller classes under {Y2Network::Sysconfig::ConnectionConfigWriters}, are involved in writing the +configuration. In this case, it does not exist a `InterfacesWriter` class, because when it comes to +interfaces the configuration is handled through connection configuration files. + +Last but not least, there are additional classes like {Y2Network::Sysconfig::RoutesFile} and +{Y2Network::Sysconfig::InterfaceFile} which abstract the details of reading/writing `ifcfg` files. + +### AutoYaST + +AutoYaST is a special case in the sense that it reads the information from a profile, instead of +using the running system as reference. Additionally, it does not implement a writer because the +configuration will be written using a different backend (like sysconfig). + + src/lib/y2network/autoinst/ + ├── config_reader.rb + ├── dns_reader.rb + └── routing_reader.rb + +For the time being, it only implements support to read DNS and routing information. ## Accessing the Configuration -The `Yast::Lan` module is still the entry point to read and write the network configuration. Basically, it keeps two configuration objects, one for the running system and another want for the wanted configuration. +The `Yast::Lan` module is still the entry point to read and write the network configuration. +Basically, it keeps two configuration objects, one for the running system and another want for the +wanted configuration. Yast.import "Lan" Yast::Lan.read(:cache) @@ -90,8 +134,8 @@ reader and will write it to the final system using the one corresponding to the | Interface type | read | write | |-----------------|------|-------| -| Ethernet | ✓ | ⌛ | -| Wireless | ✓ | ⌛ | +| Ethernet | ✓ | ✓ | +| Wireless | ✓ | ✓ | | InfiniBand | ⌛ | | | Bridge | ⌛ | | | Bonding | | | From f6b95d5030f2884b2b5bed9469524383f716ec43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 12:28:49 +0100 Subject: [PATCH 011/471] Add array based keys to the list of params in InterfaceFile --- src/lib/y2network/sysconfig/interface_file.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index e7a76acab..6d0723e55 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -70,6 +70,8 @@ def define_parameter(param_name, type = :string) # @param limit [Integer] Maximum array size # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) def define_array_parameter(param_name, limit, type = :string) + params << param_name + define_method "#{param_name}s" do return @values[param_name] if @values.key?(param_name) key = param_name.to_s.upcase From 22cc6dd6e66c6fd46831aa8ba9766bc2925f0572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 12:28:07 +0100 Subject: [PATCH 012/471] Add a Y2Network::IPAddress class --- src/lib/y2network/ip_address.rb | 73 +++++++++++++++++++++++++++++++ test/y2network/ip_address_test.rb | 65 +++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 src/lib/y2network/ip_address.rb create mode 100644 test/y2network/ip_address_test.rb diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb new file mode 100644 index 000000000..9359893d4 --- /dev/null +++ b/src/lib/y2network/ip_address.rb @@ -0,0 +1,73 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "ipaddr" +require "forwardable" + +module Y2Network + # This class represents an IP address + # + # The problem with the IPAddr from the Ruby standard library, is that it drops + # the host part according to the netmask. + # + # @example IPAddr from standard library behavior + # ip = IPAddr.new("192.168.122.1/24") + # ip.to_s #=> "192.168.122.0/24" + # + # However, what we need is to be able to keep the host part + # + # @example IPAddress behaviour + # ip = IPAddress.new("192.168.122.1/24") + # ip.to_s #=> "192.168.122.1/24" + class IPAddress + extend Forwardable + + # @return [IPAddr] IP address + attr_reader :address + # @return [Integer] Prefix + attr_reader :prefix + + def_delegators :@address, :ipv4?, :ipv6? + + class << self + def from_string(str) + address, prefix = str.split("/") + address = IPAddr.new(address) + prefix = prefix.to_i if prefix + new(address, prefix) + end + end + + # @return [Integer] IPv4 address default prefix + IPV4_DEFAULT_PREFIX = 32 + # @return [Integer] IPv6 address default prefix + IPV6_DEFAULT_PREFIX = 128 + + def initialize(address, prefix = nil) + @address = address + @prefix = prefix + @prefix ||= address.ipv4? ? IPV4_DEFAULT_PREFIX : IPV6_DEFAULT_PREFIX + end + + # Returns a string representation of the address + def to_s + "#{@address}/#{@prefix}" + end + end +end diff --git a/test/y2network/ip_address_test.rb b/test/y2network/ip_address_test.rb new file mode 100644 index 000000000..8c31a2a8f --- /dev/null +++ b/test/y2network/ip_address_test.rb @@ -0,0 +1,65 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" +require "y2network/ip_address" + +describe Y2Network::IPAddress do + describe ".from_string" do + context "when a string representing an IPv4 is given" do + let(:ip_address) { "192.168.122.1/24" } + + it "creates an IPAddress object" do + ip = described_class.from_string(ip_address) + expect(ip.address).to eq(IPAddr.new("192.168.122.1")) + expect(ip.prefix).to eq(24) + end + + context "when no prefix is given" do + let(:ip_address) { "192.168.122.1" } + + it "sets a 32 bits prefix" do + ip = described_class.from_string(ip_address) + expect(ip.address).to eq(IPAddr.new("192.168.122.1")) + expect(ip.prefix).to eq(32) + end + end + end + + context "when a string representing an IPv6 is given" do + let(:ip_address) { "2001:db8:1234:ffff:ffff:ffff:ffff:fff1/48" } + + it "creates an IPAddress object" do + ip = described_class.from_string(ip_address) + expect(ip.address).to eq(IPAddr.new("2001:db8:1234:ffff:ffff:ffff:ffff:fff1")) + expect(ip.prefix).to eq(48) + end + + context "when no prefix is given" do + let(:ip_address) { "2001:db8:1234:ffff:ffff:ffff:ffff:fff1" } + + it "sets a 128 bits prefix" do + ip = described_class.from_string(ip_address) + expect(ip.address).to eq(IPAddr.new(ip_address)) + expect(ip.prefix).to eq(128) + end + end + end + end +end From add0370c43a17ef4efeeb88e5a20fc114bbfc890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 12:34:48 +0100 Subject: [PATCH 013/471] Replace IPAddr with IPAddress when reading/writing ifcfg files --- src/lib/y2network/sysconfig/interface_file.rb | 4 ++-- test/y2network/sysconfig/interface_file_test.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 6d0723e55..578fefbcc 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -19,7 +19,7 @@ require "yast" require "pathname" -require "ipaddr" +require "y2network/ip_address" module Y2Network module Sysconfig @@ -203,7 +203,7 @@ def path # @return [IPAddr,nil] IP address or nil if it is not defined def ip_address str = fetch("IPADDR") - str.nil? || str.empty? ? nil : IPAddr.new(str) + str.nil? || str.empty? ? nil : IPAddress.new(str) end alias_method :ip_address, :ipaddr diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 47d5cd267..f05f32923 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -143,13 +143,13 @@ def file_content(scr_root, file) subject(:file) { described_class.new("eth0") } it "writes the changes to the file" do - file.ipaddr = IPAddr.new("192.168.122.1") + file.ipaddr = Y2Network::IPAddress.from_string("192.168.122.1/24") file.bootproto = :static file.save content = file_content(scr_root, file) expect(content).to include("BOOTPROTO='static'") - expect(content).to include("IPADDR='192.168.122.1'") + expect(content).to include("IPADDR='192.168.122.1/24'") end describe "when multiple wireless keys are specified" do From e231a4d1ad4256b8513594b8832fdd34f1bdcdc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 12:55:35 +0100 Subject: [PATCH 014/471] Improve IPAddress constructor and #to_s method --- src/lib/y2network/ip_address.rb | 21 +++++++++++++++++---- test/y2network/ip_address_test.rb | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index 9359893d4..8519c7915 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -48,7 +48,6 @@ class IPAddress class << self def from_string(str) address, prefix = str.split("/") - address = IPAddr.new(address) prefix = prefix.to_i if prefix new(address, prefix) end @@ -59,15 +58,29 @@ def from_string(str) # @return [Integer] IPv6 address default prefix IPV6_DEFAULT_PREFIX = 128 + # Constructor + # + # @param address [String] IP address without the prefix + # @param prefix [Integer] IP prefix (number of bits). If not specified, 32 will be used for IPv4 + # and 128 for IPv6. def initialize(address, prefix = nil) - @address = address + @address = IPAddr.new(address) @prefix = prefix - @prefix ||= address.ipv4? ? IPV4_DEFAULT_PREFIX : IPV6_DEFAULT_PREFIX + @prefix ||= @address.ipv4? ? IPV4_DEFAULT_PREFIX : IPV6_DEFAULT_PREFIX end # Returns a string representation of the address def to_s - "#{@address}/#{@prefix}" + host? ? @address.to_s : "#{@address}/#{@prefix}" + end + + private + + # Determines whether it is a host address + # + # @return [Boolean] + def host? + (ipv4? && prefix == IPV4_DEFAULT_PREFIX) && (ipv6? && prefix == IPV6_DEFAULT_PREFIX) end end end diff --git a/test/y2network/ip_address_test.rb b/test/y2network/ip_address_test.rb index 8c31a2a8f..225a367fe 100644 --- a/test/y2network/ip_address_test.rb +++ b/test/y2network/ip_address_test.rb @@ -62,4 +62,20 @@ end end end + + describe "#to_s" do + subject(:ip) { described_class.new("192.168.122.1", 24) } + + it "returns a string CIDR based representation" do + expect(ip.to_s).to eq("192.168.122.1/24") + end + + context "when it is a host address" do + subject(:ip) { described_class.new("192.168.122.1") } + + it "omits the prefix" do + expect(ip.to_s).to eq("192.168.122.1") + end + end + end end From 022a31204344cffc96d57c7da83da0898d4b8756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 14:08:52 +0100 Subject: [PATCH 015/471] Clarify why the IPAddress class is needed --- src/lib/y2network/ip_address.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index 8519c7915..f089a94b9 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -23,8 +23,9 @@ module Y2Network # This class represents an IP address # - # The problem with the IPAddr from the Ruby standard library, is that it drops - # the host part according to the netmask. + # The IPAddr from the Ruby standard library drops the host part according to the netmask. The + # problem is that YaST uses a CIDR-like string, including the host part, to set IPADDR in ifcfg-* + # files (see man 5 ifcfg for further details). # # @example IPAddr from standard library behavior # ip = IPAddr.new("192.168.122.1/24") From fd654ad402b614cb2711b5fda983f1aa1fa0bdad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 14:11:30 +0100 Subject: [PATCH 016/471] Fix IPAddress#to_s class --- src/lib/y2network/ip_address.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index f089a94b9..93ef2ea6a 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -81,7 +81,7 @@ def to_s # # @return [Boolean] def host? - (ipv4? && prefix == IPV4_DEFAULT_PREFIX) && (ipv6? && prefix == IPV6_DEFAULT_PREFIX) + (ipv4? && prefix == IPV4_DEFAULT_PREFIX) || (ipv6? && prefix == IPV6_DEFAULT_PREFIX) end end end From 85473c80ffed4583110eb5933d9316d61fa246ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 10 Jul 2019 15:20:06 +0100 Subject: [PATCH 017/471] Update from code review --- src/lib/y2network/sysconfig/interface_file.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 578fefbcc..3e3c65d93 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -58,6 +58,8 @@ def define_parameter(param_name, type = :string) end define_method "#{param_name}=" do |value| + # The `value` should be an object which responds to #to_s so its value can be written to + # the ifcfg file. @values[param_name] = value end end @@ -103,7 +105,7 @@ def params attr_reader :interface # !@attribute [r] ipaddr - # return [IPAddr] IP address + # return [Y2Network::IPAddress] IP address define_parameter(:ipaddr, :ipaddr) # !@attribute [r] name From f2e4268ce5e63269c90e4c9d3e65d55c0fe6adb0 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 11 Jul 2019 14:20:05 +0200 Subject: [PATCH 018/471] improve documentation and add check for doc coverage regression --- Rakefile | 2 ++ src/lib/y2network/dialogs/add_interface.rb | 2 ++ src/lib/y2network/dialogs/edit_interface.rb | 5 +++- src/lib/y2network/interface_config_builder.rb | 27 +++++++++++++++++++ .../interface_config_builders/bond.rb | 3 +++ .../y2network/interface_config_builders/br.rb | 1 + .../interface_config_builders/dummy.rb | 5 ++-- .../y2network/interface_config_builders/ib.rb | 3 ++- src/lib/y2network/sequences/interface.rb | 9 ++++++- 9 files changed, 51 insertions(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index 2432dd52a..f7c02bac4 100644 --- a/Rakefile +++ b/Rakefile @@ -3,4 +3,6 @@ require "yast/rake" Yast::Tasks.configuration do |conf| # lets ignore license check for now conf.skip_license_check << /.*/ + # ensure we are not getting worse with documentation + conf.documentation_minimal = 61 if conf.respond_to?(:documentation_minimal=) end diff --git a/src/lib/y2network/dialogs/add_interface.rb b/src/lib/y2network/dialogs/add_interface.rb index 7de237c8f..78f091ebd 100644 --- a/src/lib/y2network/dialogs/add_interface.rb +++ b/src/lib/y2network/dialogs/add_interface.rb @@ -63,10 +63,12 @@ def run builder end + # no back button for add dialog def back_button "" end + # as it is sub dialog it can only cancel and cannot abort def abort_button Yast::Label.CancelButton end diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index 25626074a..9cf8038ce 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -11,7 +11,8 @@ module Y2Network module Dialogs - # Dialog to Edit Interface. + # Dialog to Edit Interface. Content of dialog heavily depend on type and + # change of type is not allowed after dialog creation. class EditInterface < CWM::Dialog # @param settings [InterfaceBuilder] object holding interface configuration # modified by dialog. @@ -47,10 +48,12 @@ def contents VBox(CWM::Tabs.new(*tabs)) end + # abort is just cancel as this is sub dialog def abort_button Yast::Label.CancelButton end + # removes back button when editing device, but keep it when this dialog followed add def back_button # TODO: decide operation based on builder @settings.newly_added? ? Yast::Label.BackButton : "" diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 997b0cccb..e89962c2b 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -61,14 +61,22 @@ def newly_added? Yast::LanItems.operation == :add end + # change internal config keys. + # @note always prefer specialized method if available def []=(key, value) @config[key] = value end + # gets internal config keys. + # @note always prefer specialized method if available def [](key) @config[key] end + # save builder content to backend + # @ TODO now still LanItems actively query config attribute and write it + # down, so here mainly workarounds, but ideally this save should change + # completelly backend def save Yast::LanItems.Items[Yast::LanItems.current]["ifcfg"] = name if !driver.empty? @@ -98,22 +106,29 @@ def proposed_names Yast::LanItems.new_type_devices(type, NEW_DEVICES_COUNT) end + # checks if passed name is valid as interface name + # TODO: looks sysconfig specific def valid_name?(name) !!(name =~ /^[[:alnum:]._:-]{1,15}\z/) end + # checks if internace name already exists def name_exists?(name) Yast::NetworkInterfaces.List("").include?(name) end + # valid characters that can be used in interface name + # TODO: looks sysconfig specific def name_valid_characters Yast::NetworkInterfaces.ValidCharsIfcfg end + # List of available kernel modules for the interface def kernel_modules Yast::LanItems.GetItemModules("") end + # gets currently assigned firewall zone def firewall_zone return @firewall_zone if @firewall_zone @@ -122,28 +137,37 @@ def firewall_zone @firewall_zone = firewall_interface.zone && firewall_interface.zone.name end + # sets assigned firewall zone def firewall_zone=(value) @firewall_zone = value end + # gets currently assigned kernel module def driver @driver ||= Yast::Ops.get_string(Yast::LanItems.getCurrentItem, ["udev", "driver"], "") end + # sets kernel module for interface def driver=(value) @driver = value end + # gets specific options for kernel driver def driver_options target_driver = @driver target_driver = hwinfo.module if target_driver.empty? @driver_options ||= Yast::LanItems.driver_options[target_driver] || "" end + # sets specific options for kernel driver def driver_options=(value) @driver_options = value end + # gets aliases for interface + # @return [Array] hash values are `:label` for alias label, + # `:ip` for ip address, `:mask` for netmask and `:prefixlen` for prefix. + # Only one of `:mask` and `:prefixlen` is set. def aliases @aliases ||= Yast::LanItems.aliases.each_value.map do |data| { @@ -155,10 +179,13 @@ def aliases end end + # sets aliases for interface + # @param value [Array] see #aliases for hash values def aliases=(value) @aliases = value end + # Gets interface name that will be assigned by udev def udev_name # cannot cache as EditNicName dialog can change it Yast::LanItems.current_udev_name diff --git a/src/lib/y2network/interface_config_builders/bond.rb b/src/lib/y2network/interface_config_builders/bond.rb index 4adf13fa2..870e21094 100644 --- a/src/lib/y2network/interface_config_builders/bond.rb +++ b/src/lib/y2network/interface_config_builders/bond.rb @@ -19,7 +19,9 @@ def bondable_interfaces interfaces.all.select { |i| bondable?(i) } end + # @return [String] options for bonding attr_writer :bond_options + # current options for bonding def bond_options return @bond_options if @bond_options @@ -30,6 +32,7 @@ def bond_options @bond_options end + # (see Y2Network::InterfaceConfigBuilder#save) def save super diff --git a/src/lib/y2network/interface_config_builders/br.rb b/src/lib/y2network/interface_config_builders/br.rb index 955297cd0..6663aa0d1 100644 --- a/src/lib/y2network/interface_config_builders/br.rb +++ b/src/lib/y2network/interface_config_builders/br.rb @@ -13,6 +13,7 @@ def initialize super(type: "br") end + # Checks if any of given device is already configured and need adaptation for bridge def already_configured?(devices) devices.any? do |device| next false if Yast::NetworkInterfaces.devmap(device).nil? diff --git a/src/lib/y2network/interface_config_builders/dummy.rb b/src/lib/y2network/interface_config_builders/dummy.rb index 964c228b9..022d066cf 100644 --- a/src/lib/y2network/interface_config_builders/dummy.rb +++ b/src/lib/y2network/interface_config_builders/dummy.rb @@ -8,16 +8,15 @@ def initialize super(type: "dummy") end - # It does all operations needed for sucessfull configuration export. + # (see Y2Network::InterfaceConfigBuilder#save) # # In case of config builder for dummy interface type it gurantees that # the interface will be recognized as dummy one by the backend properly. + # @return [void] def save super @config["INTERFACETYPE"] = "dummy" - - nil end end end diff --git a/src/lib/y2network/interface_config_builders/ib.rb b/src/lib/y2network/interface_config_builders/ib.rb index 34d3a3829..c3da887f8 100644 --- a/src/lib/y2network/interface_config_builders/ib.rb +++ b/src/lib/y2network/interface_config_builders/ib.rb @@ -10,6 +10,7 @@ def initialize super(type: "ib") end + # @return [String] ipoib mode configuration attr_writer :ipoib_mode # Returns current value of infiniband mode @@ -23,7 +24,7 @@ def ipoib_mode end end - # It does all operations needed for sucessfull configuration export. + # (see Y2Network::InterfaceConfigBuilder#save) # # In case of config builder for Ib interface type it sets infiniband's # mode to reasonable default when not set explicitly. diff --git a/src/lib/y2network/sequences/interface.rb b/src/lib/y2network/sequences/interface.rb index dda30f679..73214003c 100644 --- a/src/lib/y2network/sequences/interface.rb +++ b/src/lib/y2network/sequences/interface.rb @@ -2,7 +2,11 @@ module Y2Network module Sequences - # Sequence for interface + # The response of this class is to drive workflow for sequence of dialogs. + # + # In this case for interface allowed operations are add for adding new interface, + # edit which edits existing device ( can exist only in memory ) and initialization + # of s390 devices which needs specific activation before using it. # TODO: use UI::Sequence, but it needs also another object dialogs e.g for wifi class Interface include Yast::I18n @@ -12,6 +16,7 @@ def initialize Yast.include self, "network/lan/wizards.rb" end + # Starts sequence for adding new interface and configuring it def add(default: nil) res = Y2Network::Dialogs::AddInterface.run(default: default) return unless res @@ -23,10 +28,12 @@ def add(default: nil) sym end + # Starts sequence for editing configuration of interface def edit(builder) NetworkCardSequence("edit", builder: builder) end + # Starts sequence for activating s390 device and configuring it def init_s390(builder) NetworkCardSequence("init_s390", builder: builder) end From 1bee0d5d18302e4720be1313256b5134850da0d3 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 11 Jul 2019 14:30:32 +0200 Subject: [PATCH 019/471] changes from review --- src/lib/y2network/dialogs/add_interface.rb | 2 +- src/lib/y2network/dialogs/edit_interface.rb | 4 ++-- src/lib/y2network/interface_config_builder.rb | 16 ++++++++-------- src/lib/y2network/sequences/interface.rb | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/y2network/dialogs/add_interface.rb b/src/lib/y2network/dialogs/add_interface.rb index 78f091ebd..78e57bd99 100644 --- a/src/lib/y2network/dialogs/add_interface.rb +++ b/src/lib/y2network/dialogs/add_interface.rb @@ -68,7 +68,7 @@ def back_button "" end - # as it is sub dialog it can only cancel and cannot abort + # as it is a sub dialog it can only cancel and cannot abort def abort_button Yast::Label.CancelButton end diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index 9cf8038ce..b62c0ad20 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -11,7 +11,7 @@ module Y2Network module Dialogs - # Dialog to Edit Interface. Content of dialog heavily depend on type and + # Dialog to Edit Interface. Content of dialog heavily depends on type and # change of type is not allowed after dialog creation. class EditInterface < CWM::Dialog # @param settings [InterfaceBuilder] object holding interface configuration @@ -48,7 +48,7 @@ def contents VBox(CWM::Tabs.new(*tabs)) end - # abort is just cancel as this is sub dialog + # abort is just cancel as this is a sub dialog def abort_button Yast::Label.CancelButton end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index e89962c2b..df8b6298c 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -61,7 +61,7 @@ def newly_added? Yast::LanItems.operation == :add end - # change internal config keys. + # changes internal config keys. # @note always prefer specialized method if available def []=(key, value) @config[key] = value @@ -73,10 +73,10 @@ def [](key) @config[key] end - # save builder content to backend + # saves builder content to backend # @ TODO now still LanItems actively query config attribute and write it # down, so here mainly workarounds, but ideally this save should change - # completelly backend + # completely backend def save Yast::LanItems.Items[Yast::LanItems.current]["ifcfg"] = name if !driver.empty? @@ -99,7 +99,7 @@ def save # how many device names is proposed NEW_DEVICES_COUNT = 10 - # Propose bunch of possible names for interface + # Proposes bunch of possible names for interface # do not modify anything # @return [Array] def proposed_names @@ -112,18 +112,18 @@ def valid_name?(name) !!(name =~ /^[[:alnum:]._:-]{1,15}\z/) end - # checks if internace name already exists + # checks if interface name already exists def name_exists?(name) Yast::NetworkInterfaces.List("").include?(name) end - # valid characters that can be used in interface name + # gets valid characters that can be used in interface name # TODO: looks sysconfig specific def name_valid_characters Yast::NetworkInterfaces.ValidCharsIfcfg end - # List of available kernel modules for the interface + # gets a list of available kernel modules for the interface def kernel_modules Yast::LanItems.GetItemModules("") end @@ -185,7 +185,7 @@ def aliases=(value) @aliases = value end - # Gets interface name that will be assigned by udev + # gets interface name that will be assigned by udev def udev_name # cannot cache as EditNicName dialog can change it Yast::LanItems.current_udev_name diff --git a/src/lib/y2network/sequences/interface.rb b/src/lib/y2network/sequences/interface.rb index 73214003c..5de9bfc71 100644 --- a/src/lib/y2network/sequences/interface.rb +++ b/src/lib/y2network/sequences/interface.rb @@ -2,7 +2,7 @@ module Y2Network module Sequences - # The response of this class is to drive workflow for sequence of dialogs. + # The responsibility of this class is to drive workflow for sequence of dialogs. # # In this case for interface allowed operations are add for adding new interface, # edit which edits existing device ( can exist only in memory ) and initialization From 4ff2f4bdacb576764818cf9929cad4c5c32d8f80 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 11 Jul 2019 14:58:46 +0200 Subject: [PATCH 020/471] Change from review --- src/lib/y2network/sequences/interface.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/sequences/interface.rb b/src/lib/y2network/sequences/interface.rb index 5de9bfc71..250bd3584 100644 --- a/src/lib/y2network/sequences/interface.rb +++ b/src/lib/y2network/sequences/interface.rb @@ -4,9 +4,10 @@ module Y2Network module Sequences # The responsibility of this class is to drive workflow for sequence of dialogs. # - # In this case for interface allowed operations are add for adding new interface, - # edit which edits existing device ( can exist only in memory ) and initialization - # of s390 devices which needs specific activation before using it. + # In this case, allowed operations for interface are, 'add' for adding a new interface, + # 'edit' for editing an existing device / interface or 'init_s390' for s390 + # initialization which needs specific activation before using it. + # # TODO: use UI::Sequence, but it needs also another object dialogs e.g for wifi class Interface include Yast::I18n From 07f784e058fe3a007b305a4678cd1f28b7a52749 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 11 Jul 2019 15:55:21 +0200 Subject: [PATCH 021/471] Changes from review --- src/lib/y2network/dialogs/edit_interface.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index b62c0ad20..43289fa3f 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -11,11 +11,11 @@ module Y2Network module Dialogs - # Dialog to Edit Interface. Content of dialog heavily depends on type and + # Dialog to Edit Interface. Content of the dialog heavily depends on the interface type and # change of type is not allowed after dialog creation. class EditInterface < CWM::Dialog # @param settings [InterfaceBuilder] object holding interface configuration - # modified by dialog. + # modified by the dialog. def initialize(settings) @settings = settings @@ -53,7 +53,8 @@ def abort_button Yast::Label.CancelButton end - # removes back button when editing device, but keep it when this dialog followed add + # removes back button when editing device, but keep it when this dialog is + # followed by add followed add def back_button # TODO: decide operation based on builder @settings.newly_added? ? Yast::Label.BackButton : "" From 8d44d5269d4498773f5a8825505d501f81674c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 12 Jul 2019 12:13:39 +0100 Subject: [PATCH 022/471] Add Y2Network::IPAddress#== in order to compare IP addresses --- src/lib/y2network/ip_address.rb | 10 ++++++++++ test/y2network/ip_address_test.rb | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index 93ef2ea6a..836e12081 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -75,6 +75,16 @@ def to_s host? ? @address.to_s : "#{@address}/#{@prefix}" end + # Determines whether two addresses are equivalent + # + # @param other [IPAddress] The address to compare with + # @return [Boolean] + def ==(other) + address == other.address && prefix == other.prefix + end + + alias_method :eql?, :== + private # Determines whether it is a host address diff --git a/test/y2network/ip_address_test.rb b/test/y2network/ip_address_test.rb index 225a367fe..6fa15ff65 100644 --- a/test/y2network/ip_address_test.rb +++ b/test/y2network/ip_address_test.rb @@ -78,4 +78,28 @@ end end end + + describe "#==" do + context "when address and prefix are the same" do + it "returns true" do + expect(described_class.new("192.168.122.1", 24)) + .to eq(described_class.new("192.168.122.1", 24)) + end + end + + context "when addresses are different" do + it "returns false" do + expect(described_class.new("192.168.122.1", 24)) + .to_not eq(described_class.new("192.168.122.2", 24)) + end + end + + context "when prefixes are different" do + it "returns false" do + expect(described_class.new("192.168.122.1", 24)) + .to_not eq(described_class.new("192.168.122.1", 32)) + + end + end + end end From dc06c7d64ed8b7128158c51a40501220826eb2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 12 Jul 2019 13:21:03 +0100 Subject: [PATCH 023/471] Fix IP address handling in InterfaceFile * Unit tests are using a real file now. --- src/lib/y2network/sysconfig/interface_file.rb | 6 ++--- .../scr_read/etc/sysconfig/network/ifcfg-eth1 | 11 ++++++++++ .../scr_read/etc/sysconfig/network/ifcfg-eth2 | 5 +++++ .../scr_read/etc/sysconfig/network/ifcfg-eth3 | 6 +++++ .../sysconfig/interface_file_test.rb | 22 ++++++++----------- 5 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-eth1 create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 3e3c65d93..c67686551 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -275,12 +275,12 @@ def value_as_symbol(value) value.nil? || value.empty? ? nil : value.to_sym end - # Converts the value into a IPAddr (or nil if empty) + # Converts the value into a IPAddress (or nil if empty) # # @param [String] value - # @return [IPAddr,nil] + # @return [Y2Network::IPAddress,nil] def value_as_ipaddr(value) - value.nil? || value.empty? ? nil : IPAddr.new(value) + value.nil? || value.empty? ? nil : Y2Network::IPAddress.from_string(value) end # Writes an array as a value for a given key diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth1 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth1 new file mode 100644 index 000000000..66d6c4638 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth1 @@ -0,0 +1,11 @@ +BOOTPROTO='static' +BROADCAST='' +ETHTOOL_OPTIONS='' +IPADDR_0='192.168.123.1/24' +IPADDR_1='10.0.0.1' +NETMASK_1='255.0.0.0' +MTU='' +NAME='Ethernet Card 0' +NETWORK='' +REMOTE_IPADDR='' +STARTMODE='auto' diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 new file mode 100644 index 000000000..b8b737f9f --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 @@ -0,0 +1,5 @@ +BOOTPROTO='dhcp' +BROADCAST='' +MTU='' +NAME='Ethernet Card 0' +STARTMODE='auto' diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 new file mode 100644 index 000000000..bf578ffcc --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 @@ -0,0 +1,6 @@ +BOOTPROTO='' +BROADCAST='' +MTU='' +IPADDR='' +NAME='Ethernet Card 0' +STARTMODE='auto' diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index f05f32923..0c846f49f 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -22,7 +22,9 @@ require "tmpdir" describe Y2Network::Sysconfig::InterfaceFile do - subject(:file) { described_class.new("eth0") } + subject(:file) { described_class.new(interface_name) } + + let(:interface_name) { "eth0" } def file_content(scr_root, file) path = File.join(scr_root, file.path.to_s) @@ -61,26 +63,20 @@ def file_content(scr_root, file) end describe "#ip_address" do - let(:ipaddr) { "192.168.122.122/24" } - - before do - allow(file).to receive(:fetch).with("IPADDR").and_return(ipaddr) - end - it "returns the IP address" do - expect(file.ip_address).to eq(IPAddr.new(ipaddr)) + expect(file.ip_address).to eq(Y2Network::IPAddress.from_string("192.168.123.1/24")) end context "when the IP address is empty" do - let(:ipaddr) { "" } + let(:interface_name) { "eth1" } it "returns nil" do expect(file.ip_address).to be_nil end end - context "when the IP address is undefined" do - let(:ipaddr) { nil } + context "when the IP address is missing" do + let(:interface_name) { "eth2" } it "returns nil" do expect(file.ip_address).to be_nil @@ -90,8 +86,8 @@ def file_content(scr_root, file) describe "#ipaddr=" do it "sets the bootproto" do - expect { file.ipaddr = IPAddr.new("10.0.0.1") } - .to change { file.ipaddr }.to(IPAddr.new("10.0.0.1")) + expect { file.ipaddr = Y2Network::IPAddress.from_string("10.0.0.1") } + .to change { file.ipaddr }.to(Y2Network::IPAddress.from_string("10.0.0.1")) end end From 91ab8dff28a866fa1dcbe4109d631ef4ea9693df Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 15 Jul 2019 15:53:00 +0200 Subject: [PATCH 024/471] make type for interface config builder mandatory --- src/include/network/lan/complex.rb | 6 +----- src/include/network/lan/wizards.rb | 5 ++--- src/lib/y2network/interface_config_builder.rb | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index 8d550e2da..0f1fc2acd 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -535,9 +535,7 @@ def input_done?(ret) true end - def MainDialog(init_tab, builder:) - @builder = builder - + def MainDialog(init_tab) caption = _("Network Settings") widget_descr = { "tab" => CWMTab.CreateWidget( @@ -588,8 +586,6 @@ def MainDialog(init_tab, builder:) break if input_done?(ret) end - @builder = nil - ret end diff --git a/src/include/network/lan/wizards.rb b/src/include/network/lan/wizards.rb index a3fa97181..90be78697 100644 --- a/src/include/network/lan/wizards.rb +++ b/src/include/network/lan/wizards.rb @@ -119,10 +119,9 @@ def LanAutoSequence(mode) end def MainSequence(mode) - iface_builder = Y2Network::InterfaceConfigBuilder.new aliases = { - "global" => -> { MainDialog("global", builder: iface_builder) }, - "overview" => -> { MainDialog("overview", builder: iface_builder) } + "global" => -> { MainDialog("global") }, + "overview" => -> { MainDialog("overview") } } start = "overview" diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 0edc04d70..55a233c8e 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -51,7 +51,7 @@ def self.for(type) # Constructor # # Load with reasonable defaults - def initialize(type: nil) + def initialize(type:) @type = type @config = init_device_config({}) @s390_config = init_device_s390_config({}) From 432a8bec22780c27a46d81ed67a76c88e1611e8a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 15 Jul 2019 16:32:16 +0200 Subject: [PATCH 025/471] use new type everywhere --- src/lib/y2network/dialogs/add_interface.rb | 2 +- src/lib/y2network/interface.rb | 2 +- src/lib/y2network/interface_config_builder.rb | 29 +++++++----- .../{bond.rb => bonding.rb} | 4 +- .../{br.rb => bridge.rb} | 15 ++++--- .../interface_config_builders/dummy.rb | 2 +- .../{ib.rb => infiniband.rb} | 4 +- .../interface_config_builders/vlan.rb | 2 +- src/lib/y2network/interface_type.rb | 44 ++++++++++++------- .../sysconfig/connection_config_reader.rb | 14 ++++-- .../{eth.rb => ethernet.rb} | 2 +- .../{wlan.rb => wireless.rb} | 2 +- src/lib/y2network/sysconfig/interface_file.rb | 4 +- .../y2network/sysconfig/interfaces_reader.rb | 9 +++- src/lib/y2network/widgets/boot_protocol.rb | 4 +- test/bond_test.rb | 2 +- test/bridge_test.rb | 2 +- test/cmdline_test.rb | 1 + test/default_route_test.rb | 4 +- test/y2network/dialogs/edit_interface_test.rb | 2 +- .../interface_config_builder_test.rb | 11 +++-- .../{bond_test.rb => bonding_test.rb} | 10 ++--- .../{br_test.rb => bridge_test.rb} | 10 ++--- .../{ib_test.rb => infiniband_test.rb} | 10 ++--- .../interface_config_builders/vlan_test.rb | 5 ++- test/y2network/sequences/interface_test.rb | 4 +- .../connection_config_reader_test.rb | 18 ++++---- .../{eth_test.rb => ethernet_test.rb} | 4 +- .../{wlan_test.rb => wireless_test.rb} | 4 +- .../widgets/additional_addresses_test.rb | 2 +- test/y2network/widgets/address_tab_test.rb | 2 +- .../y2network/widgets/bond_slaves_tab_test.rb | 2 +- test/y2network/widgets/bridge_ports_test.rb | 4 +- .../widgets/bridge_slaves_tab_test.rb | 2 +- test/y2network/widgets/firewall_zone_test.rb | 3 +- test/y2network/widgets/general_tab_test.rb | 3 +- test/y2network/widgets/hardware_tab_test.rb | 2 +- .../widgets/ifplugd_priority_test.rb | 3 +- test/y2network/widgets/interface_name_test.rb | 6 +-- test/y2network/widgets/kernel_module_test.rb | 4 +- 40 files changed, 143 insertions(+), 116 deletions(-) rename src/lib/y2network/interface_config_builders/{bond.rb => bonding.rb} (96%) rename src/lib/y2network/interface_config_builders/{br.rb => bridge.rb} (86%) rename src/lib/y2network/interface_config_builders/{ib.rb => infiniband.rb} (90%) rename src/lib/y2network/sysconfig/connection_config_readers/{eth.rb => ethernet.rb} (98%) rename src/lib/y2network/sysconfig/connection_config_readers/{wlan.rb => wireless.rb} (99%) rename test/y2network/interface_config_builders/{bond_test.rb => bonding_test.rb} (64%) rename test/y2network/interface_config_builders/{br_test.rb => bridge_test.rb} (73%) rename test/y2network/interface_config_builders/{ib_test.rb => infiniband_test.rb} (76%) rename test/y2network/sysconfig/connection_config_readers/{eth_test.rb => ethernet_test.rb} (91%) rename test/y2network/sysconfig/connection_config_readers/{wlan_test.rb => wireless_test.rb} (97%) diff --git a/src/lib/y2network/dialogs/add_interface.rb b/src/lib/y2network/dialogs/add_interface.rb index 7de237c8f..48625e60e 100644 --- a/src/lib/y2network/dialogs/add_interface.rb +++ b/src/lib/y2network/dialogs/add_interface.rb @@ -53,7 +53,7 @@ def run end # TODO: use factory to get proper builder - builder = InterfaceConfigBuilder.for(@type_widget.result) + builder = InterfaceConfigBuilder.for(InterfaceType.from_short_name(@type_widget.result)) proposed_name = Yast::LanItems.new_type_devices(@type_widget.result, 1).first builder.name = proposed_name Yast::NetworkInterfaces.Name = proposed_name diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 6a0f6af0f..c19a96f80 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -27,7 +27,7 @@ class Interface attr_accessor :name # @return [String] Interface description attr_accessor :description - # @return [Symbol] Interface type + # @return [InterfaceType] Interface type attr_accessor :type attr_reader :configured attr_reader :hardware diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 55a233c8e..f269a45ea 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -33,11 +33,13 @@ class InterfaceConfigBuilder # Load fresh instance of interface config builder for given type. # It can be specialized type or generic, depending if specialized is needed. - # @param type [String] type of device - # TODO: it would be nice to have type of device as Enum and not pure string + # @param type [Y2Network::InterfaceType,String] type of device or its short name def self.for(type) - require "y2network/interface_config_builders/#{type}" - InterfaceConfigBuilders.const_get(type.to_s.capitalize).new + if !type.is_a?(InterfaceType) + type = InterfaceType.from_short_name(type) or raise "Unknown type #{type.inspect}" + end + require "y2network/interface_config_builders/#{type.file_name}" + InterfaceConfigBuilders.const_get(type.class_name).new rescue LoadError => e log.info "Specialed builder for #{type} not found. Fallbacking to default. #{e.inspect}" new(type: type) @@ -51,6 +53,7 @@ def self.for(type) # Constructor # # Load with reasonable defaults + # @param type [Y2Network::InterfaceType] type of device def initialize(type:) @type = type @config = init_device_config({}) @@ -95,7 +98,7 @@ def save # do not modify anything # @return [Array] def proposed_names - Yast::LanItems.new_type_devices(type, NEW_DEVICES_COUNT) + Yast::LanItems.new_type_devices(type.short_name, NEW_DEVICES_COUNT) end def valid_name?(name) @@ -175,13 +178,15 @@ def device_sysconfig config = @config.dup # filter out options which are not needed - config.delete_if { |k, _| k =~ /WIRELESS.*/ } if type != "wlan" - config.delete_if { |k, _| k =~ /BONDING.*/ } if type != "bond" - config.delete_if { |k, _| k =~ /BRIDGE.*/ } if type != "br" - config.delete_if { |k, _| k =~ /TUNNEL.*/ } if !["tun", "tap"].include?(type) - config.delete_if { |k, _| k == "VLAN_ID" || k == "ETHERDEVICE" } if type != "vlan" - config.delete_if { |k, _| k == "IPOIB_MODE" } if type != "ib" - config.delete_if { |k, _| k == "INTERFACE" } if type != "dummy" + config.delete_if { |k, _| k =~ /WIRELESS.*/ } if type != InterfaceType::WIRELESS + config.delete_if { |k, _| k =~ /BONDING.*/ } if type != InterfaceType::BONDING + config.delete_if { |k, _| k =~ /BRIDGE.*/ } if type != InterfaceType::BRIDGE + if ![InterfaceType::TUN, InterfaceType::TAP].include?(type) + config.delete_if { |k, _| k =~ /TUNNEL.*/ } + end + config.delete_if { |k, _| k == "VLAN_ID" || k == "ETHERDEVICE" } if type != InterfaceType::VLAN + config.delete_if { |k, _| k == "IPOIB_MODE" } if type != InterfaceType::INFINIBAND + config.delete_if { |k, _| k == "INTERFACE" } if type != InterfaceType::DUMMY config.delete_if { |k, _| k == "IFPLUGD_PRIORITY" } if config["STARTMODE"] != "ifplugd" config.merge("_aliases" => lan_items_format_aliases) diff --git a/src/lib/y2network/interface_config_builders/bond.rb b/src/lib/y2network/interface_config_builders/bonding.rb similarity index 96% rename from src/lib/y2network/interface_config_builders/bond.rb rename to src/lib/y2network/interface_config_builders/bonding.rb index 4adf13fa2..fdbb50641 100644 --- a/src/lib/y2network/interface_config_builders/bond.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -4,11 +4,11 @@ module Y2Network module InterfaceConfigBuilders - class Bond < InterfaceConfigBuilder + class Bonding < InterfaceConfigBuilder include Yast::Logger def initialize - super(type: "bond") + super(type: InterfaceType::BONDING) # fill mandatory bond option @config["BOND_SLAVES"] = [] diff --git a/src/lib/y2network/interface_config_builders/br.rb b/src/lib/y2network/interface_config_builders/bridge.rb similarity index 86% rename from src/lib/y2network/interface_config_builders/br.rb rename to src/lib/y2network/interface_config_builders/bridge.rb index 955297cd0..cb2f01bd7 100644 --- a/src/lib/y2network/interface_config_builders/br.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -6,11 +6,11 @@ module Y2Network module InterfaceConfigBuilders - class Br < InterfaceConfigBuilder + class Bridge < InterfaceConfigBuilder include Yast::Logger def initialize - super(type: "br") + super(type: InterfaceType::BRIDGE) end def already_configured?(devices) @@ -31,7 +31,12 @@ def interfaces Config.find(:yast).interfaces end - NONBRIDGEABLE_TYPES = ["br", "tun", "usb", "wlan"].freeze + NONBRIDGEABLE_TYPES = [ + InterfaceType::BRIDGE, + InterfaceType::TUN, + InterfaceType::USB, + InterfaceType::WIRELESS + ].freeze NONBRIDGEABLE_STARTMODE = ["nfsroot", "ifplugd"].freeze # Checks whether an interface can be bridged in particular bridge @@ -56,8 +61,8 @@ def bridgeable?(iface) end # exclude interfaces of type unusable for bridge - if NONBRIDGEABLE_TYPES.include?(iface.type.short_name) - log.debug("Excluding (#{iface.name}) - is #{iface.type.short_name}") + if NONBRIDGEABLE_TYPES.include?(iface.type) + log.debug("Excluding (#{iface.name}) - is #{iface.type.name}") return false end diff --git a/src/lib/y2network/interface_config_builders/dummy.rb b/src/lib/y2network/interface_config_builders/dummy.rb index 964c228b9..d197aa90e 100644 --- a/src/lib/y2network/interface_config_builders/dummy.rb +++ b/src/lib/y2network/interface_config_builders/dummy.rb @@ -5,7 +5,7 @@ module Y2Network module InterfaceConfigBuilders class Dummy < InterfaceConfigBuilder def initialize - super(type: "dummy") + super(type: InterfaceType::DUMMY) end # It does all operations needed for sucessfull configuration export. diff --git a/src/lib/y2network/interface_config_builders/ib.rb b/src/lib/y2network/interface_config_builders/infiniband.rb similarity index 90% rename from src/lib/y2network/interface_config_builders/ib.rb rename to src/lib/y2network/interface_config_builders/infiniband.rb index 34d3a3829..0ce048773 100644 --- a/src/lib/y2network/interface_config_builders/ib.rb +++ b/src/lib/y2network/interface_config_builders/infiniband.rb @@ -5,9 +5,9 @@ module Y2Network module InterfaceConfigBuilders - class Ib < InterfaceConfigBuilder + class Infiniband < InterfaceConfigBuilder def initialize - super(type: "ib") + super(type: InterfaceType::INFINIBAND) end attr_writer :ipoib_mode diff --git a/src/lib/y2network/interface_config_builders/vlan.rb b/src/lib/y2network/interface_config_builders/vlan.rb index 60f8c317a..529d0dfab 100644 --- a/src/lib/y2network/interface_config_builders/vlan.rb +++ b/src/lib/y2network/interface_config_builders/vlan.rb @@ -8,7 +8,7 @@ module Y2Network module InterfaceConfigBuilders class Vlan < InterfaceConfigBuilder def initialize - super(type: "vlan") + super(type: InterfaceType::VLAN) end def etherdevice diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index e024b9a0f..6d4f1dba3 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -28,10 +28,10 @@ class InterfaceType include Yast::I18n class << self - # @param const_name [String] Constant name # @param name [String] Type name ("Ethernet", "Wireless", etc.) # @param short_name [String] Short name used in legacy code - def define_type(const_name, name, short_name) + def define_type(name, short_name) + const_name = name.upcase const_set(const_name, new(name, short_name)) all << const_get(const_name) end @@ -73,21 +73,33 @@ def to_human_string _(name) end + # Returns name for specialized class for this type e.g. for reader, write or builder + # @return [String] + def class_name + name.capitalize + end + + # Returns name for file without suffix for this type e.g. for reader, write or builder + # @return [String] + def file_name + name.downcase + end + # Define types constants - define_type "ETHERNET", N_("Ethernet"), "eth" - define_type "WIRELESS", N_("Wireless"), "wlan" - define_type "INFINIBAND", N_("Infiniband"), "ib" - define_type "BONDING", N_("Bonding"), "bond" - define_type "BRIDGE", N_("Bridge"), "br" - define_type "DUMMY", N_("Dummy"), "dummy" - define_type "VLAN", N_("VLAN"), "vlan" - define_type "TUN", N_("TUN"), "tun" - define_type "TAP", N_("TAP"), "tap" - define_type "USB", N_("USB"), "usb" + define_type N_("Ethernet"), "eth" + define_type N_("Wireless"), "wlan" + define_type N_("Infiniband"), "ib" + define_type N_("Bonding"), "bond" + define_type N_("Bridge"), "br" + define_type N_("Dummy"), "dummy" + define_type N_("VLAN"), "vlan" + define_type N_("TUN"), "tun" + define_type N_("TAP"), "tap" + define_type N_("USB"), "usb" # s390 - define_type "QETH", N_("QETH"), "qeth" - define_type "LCS", N_("LCS"), "lcs" - define_type "HIPERSOCKETS", N_("HiperSockets"), "hsi" - define_type "FICON", N_("FICON"), "ficon" + define_type N_("QETH"), "qeth" + define_type N_("LCS"), "lcs" + define_type N_("HiperSockets"), "hsi" + define_type N_("FICON"), "ficon" end end diff --git a/src/lib/y2network/sysconfig/connection_config_reader.rb b/src/lib/y2network/sysconfig/connection_config_reader.rb index 08b57f899..8d0704f31 100644 --- a/src/lib/y2network/sysconfig/connection_config_reader.rb +++ b/src/lib/y2network/sysconfig/connection_config_reader.rb @@ -28,7 +28,7 @@ class ConnectionConfigReader # Constructor # # @param name [String] Interface name - # @param type [Symbol,nil] Interface type (:eth, :wlan, etc.); if the type is unknown, + # @param type [InterfaceType, string, nil] Interface type; if the type is unknown, # `nil` can be used and it will be guessed from the configuration file is possible. # # @return [Y2Network::ConnectionConfig::Base] @@ -43,11 +43,17 @@ def read(name, type) # Returns the class to handle a given interface type # - # @param type [Symbol] + # @param type [String, InterfaceType, nil] interface type or its short name # @return [Class] A class which belongs to the ConnectionConfigReaders module def find_handler_class(type) - require "y2network/sysconfig/connection_config_readers/#{type}" - ConnectionConfigReaders.const_get(type.to_s.capitalize) + return unless type + + if !type.is_a?(InterfaceType) + t = InterfaceType.from_short_name(type) or raise "Unknown type #{type.inspect} #{type.class.inspect}" + type = t + end + require "y2network/sysconfig/connection_config_readers/#{type.file_name}" + ConnectionConfigReaders.const_get(type.class_name) rescue LoadError, NameError => e log.info "Unknown connection type: '#{type}'. " \ "Connection handler could not be loaded: #{e.message}" diff --git a/src/lib/y2network/sysconfig/connection_config_readers/eth.rb b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb similarity index 98% rename from src/lib/y2network/sysconfig/connection_config_readers/eth.rb rename to src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb index ca0280947..2162310fe 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/eth.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb @@ -24,7 +24,7 @@ module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Ethernet object given a # Sysconfig::InterfaceFile object. - class Eth + class Ethernet # @return [Y2Network::Sysconfig::InterfaceFile] attr_reader :file diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wlan.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb similarity index 99% rename from src/lib/y2network/sysconfig/connection_config_readers/wlan.rb rename to src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 372e6a41e..7963ad20b 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wlan.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -24,7 +24,7 @@ module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Wireless object given a # Sysconfig::InterfaceFile object. - class Wlan + class Wireless # @return [Y2Network::Sysconfig::InterfaceFile] attr_reader :file diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 7427c7e29..cdd1b0b00 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -158,9 +158,9 @@ def fetch(key) # # @todo Borrow logic from https://github.com/yast/yast-yast2/blob/6f7a789d00cd03adf62e00da34720f326f0e0633/library/network/src/modules/NetworkInterfaces.rb#L291 # - # @return [Symbol] Interface's type depending on the file values + # @return [String] Interface's type depending on the file values def type - :eth + "eth" end private diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 5f79593cd..4dfde7f8a 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -19,6 +19,7 @@ require "yast" require "y2network/interface" +require "y2network/interface_type" require "y2network/virtual_interface" require "y2network/physical_interface" require "y2network/fake_interface" @@ -108,7 +109,13 @@ def build_physical_interface(data) Y2Network::PhysicalInterface.new(data["dev_name"]).tap do |iface| iface.description = data["name"] type = data["type"] || Yast::NetworkInterfaces.GetTypeFromSysfs(iface.name) - iface.type = type.nil? ? :eth : type.to_sym + iface.type = case type + when nil then InterfaceType::ETHERNET + when ::String then InterfaceType.from_short_name(type) + when InterfaceType then type + else + raise "Unexpected value in interface type #{type.class.inspect}:#{type.inspect}" + end end end diff --git a/src/lib/y2network/widgets/boot_protocol.rb b/src/lib/y2network/widgets/boot_protocol.rb index 486879609..f7a948eab 100644 --- a/src/lib/y2network/widgets/boot_protocol.rb +++ b/src/lib/y2network/widgets/boot_protocol.rb @@ -1,6 +1,8 @@ require "yast" require "cwm/custom_widget" +require "y2network/interface_type" + Yast.import "DNS" Yast.import "Hostname" Yast.import "IP" @@ -87,7 +89,7 @@ def contents def ibft_available? # IBFT only for eth, is it correct? - @settings.type == "eth" + @settings.type == Y2Network::InterfaceType::ETHERNET end def init diff --git a/test/bond_test.rb b/test/bond_test.rb index b7672fbf5..05dad7050 100755 --- a/test/bond_test.rb +++ b/test/bond_test.rb @@ -65,7 +65,7 @@ # for selecting bridgable devices but imports interfaces # from LanItems internally let(:config) { Y2Network::Config.new(source: :test) } - let(:builder) { Y2Network::InterfaceConfigBuilder.for("bond") } + let(:builder) { Y2Network::InterfaceConfigBuilder.for(Y2Network::InterfaceType::BONDING) } before do allow(Y2Network::Config) diff --git a/test/bridge_test.rb b/test/bridge_test.rb index ac6579c1e..cc19ba252 100755 --- a/test/bridge_test.rb +++ b/test/bridge_test.rb @@ -103,7 +103,7 @@ # for selecting bridgable devices but imports interfaces # from LanItems internally let(:config) { Y2Network::Config.new(source: :test) } - let(:builder) { Y2Network::InterfaceConfigBuilder.for("br") } + let(:builder) { Y2Network::InterfaceConfigBuilder.for(Y2Network::InterfaceType::BRIDGE) } it "returns list of slave candidates" do allow(Y2Network::Config) diff --git a/test/cmdline_test.rb b/test/cmdline_test.rb index f53f4b3b4..b340e43c0 100644 --- a/test/cmdline_test.rb +++ b/test/cmdline_test.rb @@ -86,6 +86,7 @@ def initialize before do allow(Yast::LanItems).to receive(:Items).and_return(items) + allow(Yast::LanItems).to receive(:GetCurrentType).and_return("eth") richtext = "test
  • item1
" allow(subject).to receive(:getConfigList).and_return(["0" => { "rich_descr" => richtext }]) end diff --git a/test/default_route_test.rb b/test/default_route_test.rb index 284ff224d..4bd239f50 100755 --- a/test/default_route_test.rb +++ b/test/default_route_test.rb @@ -3,6 +3,7 @@ require_relative "test_helper" require "network/install_inf_convertor" +require "y2network/interface_config_builder" describe "Yast::LanItemsClass" do subject { Yast::LanItems } @@ -101,9 +102,8 @@ subject.Read subject.current = 0 - builder = Y2Network::InterfaceConfigBuilder.new + builder = Y2Network::InterfaceConfigBuilder.for("eth") builder.name = subject.GetCurrentName() - builder.type = subject.GetCurrentType() subject.SetItem(builder: builder) subject.Commit(builder) diff --git a/test/y2network/dialogs/edit_interface_test.rb b/test/y2network/dialogs/edit_interface_test.rb index 71d43e2bf..3e65116af 100644 --- a/test/y2network/dialogs/edit_interface_test.rb +++ b/test/y2network/dialogs/edit_interface_test.rb @@ -23,7 +23,7 @@ require "y2network/dialogs/edit_interface" describe Y2Network::Dialogs::EditInterface do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.new) } + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("eth")) } include_examples "CWM::Dialog" end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 5b1f263dd..fe537ad1c 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -7,8 +7,7 @@ describe Y2Network::InterfaceConfigBuilder do subject(:config_builder) do - res = Y2Network::InterfaceConfigBuilder.new - res.type = "eth" + res = Y2Network::InterfaceConfigBuilder.for("eth") res.name = "eth0" res end @@ -16,17 +15,17 @@ describe ".for" do context "specialized class for given type exists" do it "returns new instance of that class" do - expect(described_class.for("ib").class.to_s).to eq "Y2Network::InterfaceConfigBuilders::Ib" + expect(described_class.for("ib").class.to_s).to eq "Y2Network::InterfaceConfigBuilders::Infiniband" end end context "specialized class for given type does NOT exist" do it "returns instance of InterfaceConfigBuilder" do - expect(described_class.for("generic-device").class).to eq described_class + expect(described_class.for("eth").class).to eq described_class end - it "sets type to passed type" do - expect(described_class.for("dummy").type).to eq "dummy" + it "sets type to passed type as InterfaceType" do + expect(described_class.for("dummy").type).to eq Y2Network::InterfaceType::DUMMY end end end diff --git a/test/y2network/interface_config_builders/bond_test.rb b/test/y2network/interface_config_builders/bonding_test.rb similarity index 64% rename from test/y2network/interface_config_builders/bond_test.rb rename to test/y2network/interface_config_builders/bonding_test.rb index 6021ed892..5c8653490 100644 --- a/test/y2network/interface_config_builders/bond_test.rb +++ b/test/y2network/interface_config_builders/bonding_test.rb @@ -3,9 +3,9 @@ require_relative "../../test_helper" require "yast" -require "y2network/interface_config_builders/bond" +require "y2network/interface_config_builders/bonding" -describe Y2Network::InterfaceConfigBuilders::Bond do +describe Y2Network::InterfaceConfigBuilders::Bonding do let(:config) { Y2Network::Config.new(source: :test) } before do @@ -16,14 +16,14 @@ end subject(:config_builder) do - res = Y2Network::InterfaceConfigBuilders::Bond.new + res = Y2Network::InterfaceConfigBuilders::Bonding.new res.name = "bond0" res end describe "#type" do - it "returns 'bond'" do - expect(subject.type).to eq "bond" + it "returns bonding interface type" do + expect(subject.type).to eq Y2Network::InterfaceType::BONDING end end diff --git a/test/y2network/interface_config_builders/br_test.rb b/test/y2network/interface_config_builders/bridge_test.rb similarity index 73% rename from test/y2network/interface_config_builders/br_test.rb rename to test/y2network/interface_config_builders/bridge_test.rb index 71208261e..c04edbf1a 100644 --- a/test/y2network/interface_config_builders/br_test.rb +++ b/test/y2network/interface_config_builders/bridge_test.rb @@ -3,9 +3,9 @@ require_relative "../../test_helper" require "yast" -require "y2network/interface_config_builders/br" +require "y2network/interface_config_builders/bridge" -describe Y2Network::InterfaceConfigBuilders::Br do +describe Y2Network::InterfaceConfigBuilders::Bridge do let(:config) { Y2Network::Config.new(source: :test) } before do @@ -16,14 +16,14 @@ end subject(:config_builder) do - res = Y2Network::InterfaceConfigBuilders::Br.new + res = Y2Network::InterfaceConfigBuilders::Bridge.new res.name = "br0" res end describe "#type" do - it "returns 'br'" do - expect(subject.type).to eq "br" + it "returns bridge type" do + expect(subject.type).to eq Y2Network::InterfaceType::BRIDGE end end diff --git a/test/y2network/interface_config_builders/ib_test.rb b/test/y2network/interface_config_builders/infiniband_test.rb similarity index 76% rename from test/y2network/interface_config_builders/ib_test.rb rename to test/y2network/interface_config_builders/infiniband_test.rb index 062f5493a..9d3f2aa28 100644 --- a/test/y2network/interface_config_builders/ib_test.rb +++ b/test/y2network/interface_config_builders/infiniband_test.rb @@ -3,18 +3,18 @@ require_relative "../../test_helper" require "yast" -require "y2network/interface_config_builders/ib" +require "y2network/interface_config_builders/infiniband" -describe Y2Network::InterfaceConfigBuilders::Ib do +describe Y2Network::InterfaceConfigBuilders::Infiniband do subject(:config_builder) do - res = Y2Network::InterfaceConfigBuilders::Ib.new + res = Y2Network::InterfaceConfigBuilders::Infiniband.new res.name = "ib0" res end describe "#type" do - it "returns 'ib'" do - expect(subject.type).to eq "ib" + it "returns infiniband interface type" do + expect(subject.type).to eq Y2Network::InterfaceType::INFINIBAND end end diff --git a/test/y2network/interface_config_builders/vlan_test.rb b/test/y2network/interface_config_builders/vlan_test.rb index 0f304c538..eb20b1abc 100644 --- a/test/y2network/interface_config_builders/vlan_test.rb +++ b/test/y2network/interface_config_builders/vlan_test.rb @@ -4,6 +4,7 @@ require "yast" require "y2network/interface_config_builders/vlan" +require "y2network/interface_type" describe Y2Network::InterfaceConfigBuilders::Vlan do subject(:config_builder) do @@ -13,8 +14,8 @@ end describe "#type" do - it "returns 'vlan'" do - expect(subject.type).to eq "vlan" + it "returns vlan type" do + expect(subject.type).to eq Y2Network::InterfaceType::VLAN end end diff --git a/test/y2network/sequences/interface_test.rb b/test/y2network/sequences/interface_test.rb index e3a89138a..0067b9436 100644 --- a/test/y2network/sequences/interface_test.rb +++ b/test/y2network/sequences/interface_test.rb @@ -26,9 +26,7 @@ describe Y2Network::Sequences::Interface do let(:builder) do - res = Y2Network::InterfaceConfigBuilder.new - res.type = "eth" - res + Y2Network::InterfaceConfigBuilder.for("eth") end describe "#edit" do diff --git a/test/y2network/sysconfig/connection_config_reader_test.rb b/test/y2network/sysconfig/connection_config_reader_test.rb index c218092c4..17b77c5e5 100644 --- a/test/y2network/sysconfig/connection_config_reader_test.rb +++ b/test/y2network/sysconfig/connection_config_reader_test.rb @@ -20,28 +20,28 @@ require_relative "../../test_helper" require "y2network/sysconfig/connection_config_reader" -require "y2network/sysconfig/connection_config_readers/wlan" +require "y2network/sysconfig/connection_config_readers/wireless" require "y2network/physical_interface" describe Y2Network::Sysconfig::ConnectionConfigReader do subject(:reader) { described_class.new } describe "#read" do - let(:interface) { instance_double(Y2Network::PhysicalInterface, name: "wlan0", type: :wlan) } + let(:interface) { instance_double(Y2Network::PhysicalInterface, name: "wlan0", type: "wlan") } let(:interface_file) do - instance_double(Y2Network::Sysconfig::InterfaceFile, type: :wlan).as_null_object + instance_double(Y2Network::Sysconfig::InterfaceFile, type: "wlan").as_null_object end let(:connection_config) { double("connection_config") } let(:handler) do instance_double( - Y2Network::Sysconfig::ConnectionConfigReaders::Wlan, + Y2Network::Sysconfig::ConnectionConfigReaders::Wireless, connection_config: connection_config ) end before do allow(reader).to receive(:require).and_call_original - allow(Y2Network::Sysconfig::ConnectionConfigReaders::Wlan).to receive(:new) + allow(Y2Network::Sysconfig::ConnectionConfigReaders::Wireless).to receive(:new) .and_return(handler) allow(Y2Network::Sysconfig::InterfaceFile).to receive(:new) .and_return(interface_file) @@ -49,8 +49,8 @@ it "uses the appropiate handler" do expect(reader).to receive(:require) - .with("y2network/sysconfig/connection_config_readers/wlan") - conn = reader.read(interface, :wlan) + .with("y2network/sysconfig/connection_config_readers/wireless") + conn = reader.read(interface, "wlan") expect(conn).to be(connection_config) end @@ -65,8 +65,8 @@ instance_double(Y2Network::Sysconfig::InterfaceFile, type: :foo) end - it "returns nil" do - expect(reader.read(interface, :foo)).to be_nil + it "raise exception" do + expect { reader.read(interface, :null) }.to raise_error(RuntimeError) end end end diff --git a/test/y2network/sysconfig/connection_config_readers/eth_test.rb b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb similarity index 91% rename from test/y2network/sysconfig/connection_config_readers/eth_test.rb rename to test/y2network/sysconfig/connection_config_readers/ethernet_test.rb index b9eb124bc..85984e241 100644 --- a/test/y2network/sysconfig/connection_config_readers/eth_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/eth" +require "y2network/sysconfig/connection_config_readers/ethernet" require "y2network/sysconfig/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Eth do +describe Y2Network::Sysconfig::ConnectionConfigReaders::Ethernet do subject(:handler) { described_class.new(file) } let(:address) { IPAddr.new("192.168.122.1") } diff --git a/test/y2network/sysconfig/connection_config_readers/wlan_test.rb b/test/y2network/sysconfig/connection_config_readers/wireless_test.rb similarity index 97% rename from test/y2network/sysconfig/connection_config_readers/wlan_test.rb rename to test/y2network/sysconfig/connection_config_readers/wireless_test.rb index 655c49c19..642b23ec4 100644 --- a/test/y2network/sysconfig/connection_config_readers/wlan_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/wireless_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/wlan" +require "y2network/sysconfig/connection_config_readers/wireless" require "y2network/sysconfig/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Wlan do +describe Y2Network::Sysconfig::ConnectionConfigReaders::Wireless do subject(:handler) { described_class.new(file) } let(:address) { IPAddr.new("192.168.122.1") } diff --git a/test/y2network/widgets/additional_addresses_test.rb b/test/y2network/widgets/additional_addresses_test.rb index ab3808e56..c34232880 100644 --- a/test/y2network/widgets/additional_addresses_test.rb +++ b/test/y2network/widgets/additional_addresses_test.rb @@ -24,7 +24,7 @@ require "y2network/interface_config_builder" describe Y2Network::Widgets::AdditionalAddresses do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.new) } + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("eth")) } include_examples "CWM::CustomWidget" diff --git a/test/y2network/widgets/address_tab_test.rb b/test/y2network/widgets/address_tab_test.rb index dc168a108..8749161e0 100644 --- a/test/y2network/widgets/address_tab_test.rb +++ b/test/y2network/widgets/address_tab_test.rb @@ -24,7 +24,7 @@ require "y2network/interface_config_builder" describe Y2Network::Widgets::AddressTab do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.new) } + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("eth")) } include_examples "CWM::Tab" end diff --git a/test/y2network/widgets/bond_slaves_tab_test.rb b/test/y2network/widgets/bond_slaves_tab_test.rb index a27e7a633..891372443 100644 --- a/test/y2network/widgets/bond_slaves_tab_test.rb +++ b/test/y2network/widgets/bond_slaves_tab_test.rb @@ -24,7 +24,7 @@ require "y2network/interface_config_builder" describe Y2Network::Widgets::BondSlavesTab do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.new) } + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("bond")) } include_examples "CWM::Tab" end diff --git a/test/y2network/widgets/bridge_ports_test.rb b/test/y2network/widgets/bridge_ports_test.rb index 4dd32a648..6006064e9 100644 --- a/test/y2network/widgets/bridge_ports_test.rb +++ b/test/y2network/widgets/bridge_ports_test.rb @@ -21,10 +21,10 @@ require "cwm/rspec" require "y2network/widgets/bridge_ports" -require "y2network/interface_config_builders/br" +require "y2network/interface_config_builders/bridge" describe Y2Network::Widgets::BridgePorts do - let(:builder) { Y2Network::InterfaceConfigBuilders::Br.new } + let(:builder) { Y2Network::InterfaceConfigBuilders::Bridge.new } subject { described_class.new(builder) } before do diff --git a/test/y2network/widgets/bridge_slaves_tab_test.rb b/test/y2network/widgets/bridge_slaves_tab_test.rb index ea5a3c6a9..27cc819f5 100644 --- a/test/y2network/widgets/bridge_slaves_tab_test.rb +++ b/test/y2network/widgets/bridge_slaves_tab_test.rb @@ -24,7 +24,7 @@ require "y2network/interface_config_builder" describe Y2Network::Widgets::BridgeSlavesTab do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.new) } + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("br")) } include_examples "CWM::Tab" end diff --git a/test/y2network/widgets/firewall_zone_test.rb b/test/y2network/widgets/firewall_zone_test.rb index 793bee7df..0273e6a2b 100755 --- a/test/y2network/widgets/firewall_zone_test.rb +++ b/test/y2network/widgets/firewall_zone_test.rb @@ -8,8 +8,7 @@ describe Y2Network::Widgets::FirewallZone do let(:builder) do - res = Y2Network::InterfaceConfigBuilder.new - res.type = "eth" + res = Y2Network::InterfaceConfigBuilder.for("eth") res.name = "eth0" res end diff --git a/test/y2network/widgets/general_tab_test.rb b/test/y2network/widgets/general_tab_test.rb index 5e24a43eb..070b62759 100644 --- a/test/y2network/widgets/general_tab_test.rb +++ b/test/y2network/widgets/general_tab_test.rb @@ -25,8 +25,7 @@ describe Y2Network::Widgets::GeneralTab do let(:builder) do - res = Y2Network::InterfaceConfigBuilder.new - res.type = "eth" + res = Y2Network::InterfaceConfigBuilder.for("eth") res.name = "eth0" res end diff --git a/test/y2network/widgets/hardware_tab_test.rb b/test/y2network/widgets/hardware_tab_test.rb index 38d4325e1..906acf523 100644 --- a/test/y2network/widgets/hardware_tab_test.rb +++ b/test/y2network/widgets/hardware_tab_test.rb @@ -24,7 +24,7 @@ require "y2network/interface_config_builder" describe Y2Network::Widgets::HardwareTab do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.new) } + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("eth")) } include_examples "CWM::Tab" end diff --git a/test/y2network/widgets/ifplugd_priority_test.rb b/test/y2network/widgets/ifplugd_priority_test.rb index 39adb172c..1a1218dff 100644 --- a/test/y2network/widgets/ifplugd_priority_test.rb +++ b/test/y2network/widgets/ifplugd_priority_test.rb @@ -25,8 +25,7 @@ describe Y2Network::Widgets::IfplugdPriority do let(:builder) do - res = Y2Network::InterfaceConfigBuilder.new - res.type = "eth" + res = Y2Network::InterfaceConfigBuilder.for("eth") res["IFPLUGD_PRIORITY"] = "50" res end diff --git a/test/y2network/widgets/interface_name_test.rb b/test/y2network/widgets/interface_name_test.rb index 1b0f8bed5..122726385 100644 --- a/test/y2network/widgets/interface_name_test.rb +++ b/test/y2network/widgets/interface_name_test.rb @@ -24,11 +24,7 @@ require "y2network/interface_config_builder" describe Y2Network::Widgets::InterfaceName do - let(:builder) do - res = Y2Network::InterfaceConfigBuilder.new - res.type = "eth" - res - end + let(:builder) { Y2Network::InterfaceConfigBuilder.for("eth") } subject { described_class.new(builder) } include_examples "CWM::ComboBox" diff --git a/test/y2network/widgets/kernel_module_test.rb b/test/y2network/widgets/kernel_module_test.rb index b47f29aae..b3389aba3 100644 --- a/test/y2network/widgets/kernel_module_test.rb +++ b/test/y2network/widgets/kernel_module_test.rb @@ -25,9 +25,7 @@ describe Y2Network::Widgets::KernelModule do let(:builder) do - res = Y2Network::InterfaceConfigBuilder.new - res.type = "eth" - res + Y2Network::InterfaceConfigBuilder.for("eth") end subject { described_class.new(builder) } From 3e63696bcf87b7180ff325e4e2c5ec43ed0427bb Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 18 Jul 2019 16:36:37 +0200 Subject: [PATCH 026/471] add startmode object --- src/lib/y2network/connection_config/base.rb | 2 + src/lib/y2network/interface_config_builder.rb | 29 ++++++++++++ src/lib/y2network/startmode.rb | 45 +++++++++++++++++++ src/lib/y2network/startmodes.rb | 6 +++ src/lib/y2network/startmodes/auto.rb | 38 ++++++++++++++++ src/lib/y2network/startmodes/hotplug.rb | 38 ++++++++++++++++ src/lib/y2network/startmodes/ifplugd.rb | 41 +++++++++++++++++ src/lib/y2network/startmodes/manual.rb | 38 ++++++++++++++++ src/lib/y2network/startmodes/nfsroot.rb | 38 ++++++++++++++++ src/lib/y2network/startmodes/off.rb | 38 ++++++++++++++++ src/lib/y2network/widgets/ifplugd_priority.rb | 4 +- src/lib/y2network/widgets/startmode.rb | 23 +++------- 12 files changed, 321 insertions(+), 19 deletions(-) create mode 100644 src/lib/y2network/startmode.rb create mode 100644 src/lib/y2network/startmodes.rb create mode 100644 src/lib/y2network/startmodes/auto.rb create mode 100644 src/lib/y2network/startmodes/hotplug.rb create mode 100644 src/lib/y2network/startmodes/ifplugd.rb create mode 100644 src/lib/y2network/startmodes/manual.rb create mode 100644 src/lib/y2network/startmodes/nfsroot.rb create mode 100644 src/lib/y2network/startmodes/off.rb diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 61efb4140..78e484a1e 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -45,6 +45,8 @@ class Base attr_accessor :secondary_ip_addresses # @return [Integer, nil] attr_accessor :mtu + # @return [Startmode, nil] + attr_accessor :startmode # Returns the connection type # diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index f269a45ea..109e77146 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -18,7 +18,9 @@ # find current contact information at www.suse.com. require "yast" +require "y2network/connection_config/base" require "y2network/hwinfo" +require "y2network/startmode" require "y2firewall/firewalld" require "y2firewall/firewalld/interface" @@ -58,6 +60,8 @@ def initialize(type:) @type = type @config = init_device_config({}) @s390_config = init_device_s390_config({}) + # TODO: create specialized connection for type + @connection_config = ConnectionConfig::Base.new end def newly_added? @@ -129,6 +133,31 @@ def firewall_zone=(value) @firewall_zone = value end + # @return [Startmode] + def startmode + # in future use only @connection_config and just delegate method + startmode = Startmode.create(@config["STARTMODE"]) + startmode.priority = @config["IFPLUGD_PRIORITY"] if startmode.name == "ifplugd" + startmode + end + + def startmode=(name) + mode = Startmode.create(name) + @connection_config.startmode = mode + @config["STARTMODE"] = mode.name + end + + def ifplugd_priority=(value) + @config["IFPLUGD_PRIORITY"] = value.to_s + @connection_config.startmode = Startmode.create("ifplugd") + @connection_config.startmode.priority = value.to_i + end + + def ifplugd_priority + # in future use only @connection_config and just delegate method + @config["IFPLUGD_PRIORITY"].to_i + end + def driver @driver ||= Yast::Ops.get_string(Yast::LanItems.getCurrentItem, ["udev", "driver"], "") end diff --git a/src/lib/y2network/startmode.rb b/src/lib/y2network/startmode.rb new file mode 100644 index 000000000..12c8277a9 --- /dev/null +++ b/src/lib/y2network/startmode.rb @@ -0,0 +1,45 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + + +module Y2Network + # Base class for startmode. It allows to create new one according to name or anlist all. + # Its child have to define `to_human_string` method and possibly its own specialized attributes. + # TODO: as backends differs, we probably also need to have flag there to which backends mode exists + class Startmode + attr_reader :name + alias_method :to_s, :name + + def initialize(name) + @name = name + end + + # gets new instance of startmode for given type and its params + def self.create(name) + # avoid circular dependencies + require "y2network/startmodes" + Startmodes.const_get(name.capitalize).new + end + + def self.all + require "y2network/startmodes" + Startmodes.constants.map { |c| Startmodes.const_get(c).new } + end + end +end diff --git a/src/lib/y2network/startmodes.rb b/src/lib/y2network/startmodes.rb new file mode 100644 index 000000000..4529e9a7e --- /dev/null +++ b/src/lib/y2network/startmodes.rb @@ -0,0 +1,6 @@ +require "y2network/startmodes/auto" +require "y2network/startmodes/hotplug" +require "y2network/startmodes/ifplugd" +require "y2network/startmodes/manual" +require "y2network/startmodes/nfsroot" +require "y2network/startmodes/off" diff --git a/src/lib/y2network/startmodes/auto.rb b/src/lib/y2network/startmodes/auto.rb new file mode 100644 index 000000000..a8632e814 --- /dev/null +++ b/src/lib/y2network/startmodes/auto.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/startmode" + +module Y2Network + module Startmodes + class Auto < Startmode + include Yast::I18n + + def initialize + textdomain "network" + + super("auto") + end + + def to_human_string + _("At Boot Time") + end + end + end +end diff --git a/src/lib/y2network/startmodes/hotplug.rb b/src/lib/y2network/startmodes/hotplug.rb new file mode 100644 index 000000000..a8c4087e2 --- /dev/null +++ b/src/lib/y2network/startmodes/hotplug.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/startmode" + +module Y2Network + module Startmodes + class Hotplug < Startmode + include Yast::I18n + + def initialize + textdomain "network" + + super("hotplug") + end + + def to_human_string + _("On Hotplug") + end + end + end +end diff --git a/src/lib/y2network/startmodes/ifplugd.rb b/src/lib/y2network/startmodes/ifplugd.rb new file mode 100644 index 000000000..397158619 --- /dev/null +++ b/src/lib/y2network/startmodes/ifplugd.rb @@ -0,0 +1,41 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/startmode" + +module Y2Network + module Startmodes + class Ifplugd < Startmode + include Yast::I18n + attr_accessor :priority + + def initialize + textdomain "network" + + @priority = 0 + + super("ifplugd") + end + + def to_human_string + _("On Cable Connection") + end + end + end +end diff --git a/src/lib/y2network/startmodes/manual.rb b/src/lib/y2network/startmodes/manual.rb new file mode 100644 index 000000000..d0b89fb41 --- /dev/null +++ b/src/lib/y2network/startmodes/manual.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/startmode" + +module Y2Network + module Startmodes + class Manual < Startmode + include Yast::I18n + + def initialize + textdomain "network" + + super("manual") + end + + def to_human_string + _("Manually") + end + end + end +end diff --git a/src/lib/y2network/startmodes/nfsroot.rb b/src/lib/y2network/startmodes/nfsroot.rb new file mode 100644 index 000000000..ec662108f --- /dev/null +++ b/src/lib/y2network/startmodes/nfsroot.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/startmode" + +module Y2Network + module Startmodes + class Nfsroot < Startmode + include Yast::I18n + + def initialize + textdomain "network" + + super("nfsroot") + end + + def to_human_string + _("On NFSroot") + end + end + end +end diff --git a/src/lib/y2network/startmodes/off.rb b/src/lib/y2network/startmodes/off.rb new file mode 100644 index 000000000..006cb5439 --- /dev/null +++ b/src/lib/y2network/startmodes/off.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/startmode" + +module Y2Network + module Startmodes + class Off < Startmode + include Yast::I18n + + def initialize + textdomain "network" + + super("off") + end + + def to_human_string + _("Never") + end + end + end +end diff --git a/src/lib/y2network/widgets/ifplugd_priority.rb b/src/lib/y2network/widgets/ifplugd_priority.rb index c356e7990..3a03e9be4 100644 --- a/src/lib/y2network/widgets/ifplugd_priority.rb +++ b/src/lib/y2network/widgets/ifplugd_priority.rb @@ -35,11 +35,11 @@ def maximum end def init - self.value = @config["IFPLUGD_PRIORITY"].to_i + self.value = @config.ifplugd_priority end def store - @config["IFPLUGD_PRIORITY"] = value.to_s + @config.ifplugd_priority = value.to_i end end end diff --git a/src/lib/y2network/widgets/startmode.rb b/src/lib/y2network/widgets/startmode.rb index 5a94b0f67..6b81dd5fb 100644 --- a/src/lib/y2network/widgets/startmode.rb +++ b/src/lib/y2network/widgets/startmode.rb @@ -1,4 +1,5 @@ require "cwm/common_widgets" +require "y2network/startmode" module Y2Network module Widgets @@ -19,12 +20,12 @@ def label end def init - self.value = @config["STARTMODE"] + self.value = @config.startmode.name handle end def store - @config["STARTMODE"] = value + @config.startmode = value end def handle @@ -78,21 +79,9 @@ def help end def items - [ - # onboot, on and boot are aliases for auto - # See NetworkInterfaces::CanonicalizeStartmode - # TRANSLATORS: Combo box option for Device Activation - ["auto", _("At Boot Time")], - ["off", _("Never")], - # TRANSLATORS: Combo box option for Device Activation - ["manual", _("Manually")], - # TRANSLATORS: Combo box option for Device Activation - ["ifplugd", _("On Cable Connection")], - # TRANSLATORS: Combo box option for Device Activation - ["hotplug", _("On Hotplug")], - # TRANSLATORS: Combo box option for Device Activation - ["nfsroot", _("On NFSroot")] - ] + Y2Network::Startmode.all.map do |mode| + [mode.to_s, mode.to_human_string] + end end end end From 2d85863be58f3a7935a0b641824f7a7b6f5a9b12 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 10:02:12 +0200 Subject: [PATCH 027/471] add boot protocol class --- src/lib/y2network/boot_protocol.rb | 71 +++++++++++++++++++ src/lib/y2network/connection_config/base.rb | 3 +- src/lib/y2network/interface_config_builder.rb | 7 +- src/lib/y2network/interface_type.rb | 2 + test/y2network/boot_protocol_test.rb | 44 ++++++++++++ 5 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 src/lib/y2network/boot_protocol.rb create mode 100644 test/y2network/boot_protocol_test.rb diff --git a/src/lib/y2network/boot_protocol.rb b/src/lib/y2network/boot_protocol.rb new file mode 100644 index 000000000..b961b0bff --- /dev/null +++ b/src/lib/y2network/boot_protocol.rb @@ -0,0 +1,71 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" + +module Y2Network + # This class represents the boot protocols which are supported (not all by all backends). + # + # Constants may be defined using the {define_protocol} method. + class BootProtocol + class << self + # Returns all the existing protocols + # + # @return [Array] + def all + @all ||= BootProtocol.constants.map { |c| BootProtocol.const_get(c) } + end + + # Returns the boot protocol with a given name + # + # @param name [String] + # @return [BootProtocol,nil] Boot protocol or nil is not found + def from_name(name) + all.find { |t| t.name == name } + end + end + + # @return [String] Returns protocol name + attr_reader :name + + # Constructor + # + # @param name [String] protocol name + def initialize(name) + @name = name + end + + # iBFT boot protocol + IBFT = new("ibft") + # statically assigned interface properties + STATIC = new("static") + # DHCP for both ipv4 and ipv6 + DHCP = new("dhcp") + # DHCP for ipv4 only + DHCP4 = new("dhcp4") + # DHCP for ipv6 only + DHCP6 = new("dhcp6") + # combination of zeroconf for ipv4 and DHCP for ipv6 + DHCP_AUTOIP = new("dhcp+autoip") + # zeroconf for ipv4 + AUTOIP = new("autoip") + # do not assign properties. Usefull for bond slave or bridge port + NONE = new("none") + end +end diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 78e484a1e..2d0845032 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -36,8 +36,7 @@ class Base # # @return [Interface, nil] attr_accessor :interface - # @return [String] Bootproto (static, dhcp, ,dhcp4, dhcp6, autoip, - # dhcp+autoip, auto6, 6to4, none) + # @return [BootProtocol] Bootproto attr_accessor :bootproto # @return [IPAddr,nil] attr_accessor :ip_address diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 109e77146..14ef955d7 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -143,13 +143,16 @@ def startmode def startmode=(name) mode = Startmode.create(name) - @connection_config.startmode = mode + # assign only if it is not already this value. This helps with ordering of ifplugd_priority + @connection_config.startmode = mode if @connection_config.startmode.name != mode.name @config["STARTMODE"] = mode.name end def ifplugd_priority=(value) @config["IFPLUGD_PRIORITY"] = value.to_s - @connection_config.startmode = Startmode.create("ifplugd") + if @connection_config.startmode.name == "ifplugd" + @connection_config.startmode = Startmode.create("ifplugd") + end @connection_config.startmode.priority = value.to_i end diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index 6d4f1dba3..3ef98a867 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -60,6 +60,8 @@ def from_short_name(short_name) # Constructor # # @param name [String] Type name + # @param short_name [String] short name as is used for prefixing of + # interface name (e.g. bond, eth or wlan) def initialize(name, short_name) textdomain "network" @name = name diff --git a/test/y2network/boot_protocol_test.rb b/test/y2network/boot_protocol_test.rb new file mode 100644 index 000000000..e19b7a564 --- /dev/null +++ b/test/y2network/boot_protocol_test.rb @@ -0,0 +1,44 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" + +require "y2network/boot_protocol" + +describe Y2Network::BootProtocol do + subject { described_class.new("dhcp") } + + describe ".all" do + it "returns all known boot protocols" do + expect(described_class.all).to_not be_empty + expect(described_class.all.first).to be_a(described_class) + end + end + + describe ".from_name" do + it "returns boot protocol with given name" do + expect(described_class.from_name("dhcp4")).to eq Y2Network::BootProtocol::DHCP4 + end + + it "returns nil if given name not found" do + expect(described_class.from_name("dhcp8")).to eq nil + end + end +end + From ca2917b544eaefb731d78ba0e51c30ac8a707e70 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 10:48:48 +0200 Subject: [PATCH 028/471] change from review --- src/lib/y2network/dialogs/edit_interface.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index 43289fa3f..a8fd72c7f 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -53,8 +53,8 @@ def abort_button Yast::Label.CancelButton end - # removes back button when editing device, but keep it when this dialog is - # followed by add followed add + # removes back button when editing device, but keep it when this dialog follows adding + # new interface def back_button # TODO: decide operation based on builder @settings.newly_added? ? Yast::Label.BackButton : "" From 54685a2860a0626a91061d2e3ac0945da0abf250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 19 Jul 2019 11:04:59 +0100 Subject: [PATCH 029/471] Write DNS settings only once --- src/lib/y2network/sysconfig/config_writer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index c96fd0623..451cfcb14 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -46,6 +46,7 @@ def write(config, old_config = nil) file.save write_dns_settings(config, old_config) + write_connections(config.connections) end private @@ -78,8 +79,7 @@ def write_interface_changes(config, old_config) file.remove end - write_dns_settings(config, old_config) - write_connections(config.connections) + nil end # Writes ip forwarding setup From 3a10419c834894f88c31cb8c47e4f042a91371f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 19 Jul 2019 11:15:16 +0100 Subject: [PATCH 030/471] Rename writers to use the new interface type names --- src/lib/y2network/sysconfig/connection_config_writer.rb | 8 ++++---- .../connection_config_writers/{eth.rb => ethernet.rb} | 2 +- .../connection_config_writers/{wlan.rb => wireless.rb} | 2 +- test/y2network/sysconfig/connection_config_writer_test.rb | 6 +++--- .../{eth_test.rb => ethernet_test.rb} | 5 +++-- .../{wlan_test.rb => wireless_test.rb} | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) rename src/lib/y2network/sysconfig/connection_config_writers/{eth.rb => ethernet.rb} (98%) rename src/lib/y2network/sysconfig/connection_config_writers/{wlan.rb => wireless.rb} (99%) rename test/y2network/sysconfig/connection_config_writers/{eth_test.rb => ethernet_test.rb} (90%) rename test/y2network/sysconfig/connection_config_writers/{wlan_test.rb => wireless_test.rb} (96%) diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index e68541fa3..3fb7ee277 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -29,7 +29,7 @@ class ConnectionConfigWriter # @param conn [Y2Network::ConnectionConfig::Base] Connection configuration to write def write(conn) file = Y2Network::Sysconfig::InterfaceFile.new(conn.interface) - handler_class = find_handler_class(conn.type.short_name) + handler_class = find_handler_class(conn.type) return nil if handler_class.nil? file.clean handler_class.new(file).write(conn) @@ -40,11 +40,11 @@ def write(conn) # Returns the class to handle a given interface type # - # @param type [Symbol] + # @param type [Y2Network::InterfaceType] Interface type # @return [Class] A class which belongs to the ConnectionConfigWriters module def find_handler_class(type) - require "y2network/sysconfig/connection_config_writers/#{type}" - ConnectionConfigWriters.const_get(type.to_s.capitalize) + require "y2network/sysconfig/connection_config_writers/#{type.file_name}" + ConnectionConfigWriters.const_get(type.class_name) rescue LoadError, NameError => e log.info "Unknown connection type: '#{type}'. " \ "Connection handler could not be loaded: #{e.message}" diff --git a/src/lib/y2network/sysconfig/connection_config_writers/eth.rb b/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb similarity index 98% rename from src/lib/y2network/sysconfig/connection_config_writers/eth.rb rename to src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb index ca78397ee..593f828ec 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/eth.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb @@ -22,7 +22,7 @@ module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Ethernet # object to the underlying system. - class Eth + class Ethernet # @return [Y2Network::Sysconfig::InterfaceFile] attr_reader :file diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb similarity index 99% rename from src/lib/y2network/sysconfig/connection_config_writers/wlan.rb rename to src/lib/y2network/sysconfig/connection_config_writers/wireless.rb index 8379a007f..b670db491 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wlan.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb @@ -21,7 +21,7 @@ module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Wireless # object to the underlying system. - class Wlan + class Wireless # @return [Y2Network::Sysconfig::InterfaceFile] attr_reader :file diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/sysconfig/connection_config_writer_test.rb index cd90f11d5..89631d158 100644 --- a/test/y2network/sysconfig/connection_config_writer_test.rb +++ b/test/y2network/sysconfig/connection_config_writer_test.rb @@ -20,7 +20,7 @@ require_relative "../../test_helper" require "y2network/sysconfig/connection_config_writer" -require "y2network/sysconfig/connection_config_writers/eth" +require "y2network/sysconfig/connection_config_writers/ethernet" require "y2network/connection_config/ethernet" require "y2network/interface_type" @@ -30,7 +30,7 @@ describe "#write" do let(:handler) do instance_double( - Y2Network::Sysconfig::ConnectionConfigWriters::Eth, + Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet, write: nil ) end @@ -51,7 +51,7 @@ before do allow(writer).to receive(:require).and_call_original - allow(Y2Network::Sysconfig::ConnectionConfigWriters::Eth).to receive(:new) + allow(Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet).to receive(:new) .and_return(handler) allow(Y2Network::Sysconfig::InterfaceFile).to receive(:new).and_return(file) end diff --git a/test/y2network/sysconfig/connection_config_writers/eth_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb similarity index 90% rename from test/y2network/sysconfig/connection_config_writers/eth_test.rb rename to test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index 1ed5d925e..7118be48f 100644 --- a/test/y2network/sysconfig/connection_config_writers/eth_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -19,10 +19,11 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/eth" +require "y2network/sysconfig/connection_config_writers/ethernet" require "y2network/sysconfig/interface_file" +require "y2network/connection_config/ethernet" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Eth do +describe Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet do subject(:writer) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/wlan_test.rb b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb similarity index 96% rename from test/y2network/sysconfig/connection_config_writers/wlan_test.rb rename to test/y2network/sysconfig/connection_config_writers/wireless_test.rb index f7ae2fc92..81cd9266d 100644 --- a/test/y2network/sysconfig/connection_config_writers/wlan_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/wlan" +require "y2network/sysconfig/connection_config_writers/wireless" require "y2network/sysconfig/interface_file" require "y2network/connection_config/wireless" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Wlan do +describe Y2Network::Sysconfig::ConnectionConfigWriters::Wireless do subject(:handler) { described_class.new(file) } let(:file) { Y2Network::Sysconfig::InterfaceFile.new("wlan0") } From ea1faacb9ef08ec83d53471cc0220df8245ae9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 12 Jul 2019 10:58:26 +0100 Subject: [PATCH 031/471] Improve and update network-ng.md document * Update current status. * Add a plan. * Add information about the UI layer and interface builders. --- doc/network-ng.md | 59 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 14 deletions(-) diff --git a/doc/network-ng.md b/doc/network-ng.md index 3303d86c0..c928513b8 100644 --- a/doc/network-ng.md +++ b/doc/network-ng.md @@ -3,7 +3,9 @@ This document tries to describe the details of the network-ng data model and how all the pieces are combined. -## Overall Approach +## Data Model + +### Overall Approach {Y2Network::Config} and other associated classes represent the network configuration in a backend agnostic way. It should not matter whether you are using `sysconfig` files, NetworkManager or @@ -25,7 +27,7 @@ filesystem by using a *configuration writer*. Obviously, we should implement configuration readers and writers for whathever backend we would like to support. At this point of time, only `Sysconfig` and `Autoinst` are supported. -## The Configuration Classes +### The Configuration Classes {Y2Network::Config} offers and API to deal with network configuration, but it collaborates with other classes. @@ -38,7 +40,7 @@ other classes. Currently it is bound to an interface name, but we plan to provide more advanced matchers. * {Y2Network::Routing}: holds routing information, including IP forwarding settings, routing tables, etc. -## Backend Support +### Multi-Backend Support As mentioned above, Y2Network is designed to support different backends. It is expected to implement a reader and a writer for each backend (except for AutoYaST, which is an special case). The reader @@ -50,7 +52,7 @@ As a developer, you rarely will need to access to readers/writers because `Yast: an API to read and write the configuration. See the [Accessing the Configuration](#accessing-the-configuration) section for further details. -### Sysconfig +#### Sysconfig The sysconfig backend support is composed by these files: @@ -59,12 +61,14 @@ The sysconfig backend support is composed by these files: ├── config_writer.rb <- WRITER ├── connection_config_reader.rb ├── connection_config_readers - │   ├── eth.rb - │   └── wlan.rb + │   ├── ethernet.rb + │   ├── wireless.rb + │ └── ... ├── connection_config_writer.rb ├── connection_config_writers - │   ├── eth.rb - │   └── wlan.rb + │   ├── ethernet.rb + │   ├── wireless.rb + │ └── ... ├── dns_reader.rb ├── dns_writer.rb ├── interface_file.rb @@ -89,7 +93,7 @@ interfaces the configuration is handled through connection configuration files. Last but not least, there are additional classes like {Y2Network::Sysconfig::RoutesFile} and {Y2Network::Sysconfig::InterfaceFile} which abstract the details of reading/writing `ifcfg` files. -### AutoYaST +#### AutoYaST AutoYaST is a special case in the sense that it reads the information from a profile, instead of using the running system as reference. Additionally, it does not implement a writer because the @@ -102,7 +106,7 @@ configuration will be written using a different backend (like sysconfig). For the time being, it only implements support to read DNS and routing information. -## Accessing the Configuration +### Accessing the Configuration The `Yast::Lan` module is still the entry point to read and write the network configuration. Basically, it keeps two configuration objects, one for the running system and another want for the @@ -122,11 +126,32 @@ wanted configuration. Any change you want to apply to the running system should be performed by modifying the `yast_config` and writing the changes. -## AutoYaST Support +## New UI layer + +### Interface Configuration Builders + +In the old code, there was no clear separation between UI and business logic. In order to improve +the situation, we introduced the concept of [interface configuration +builders](https://github.com/yast/yast-network/blob/network-ng/src/lib/y2network/interface_config_builder.rb). + +We already have implemented support for several interface types. You can find them under the +[Y2Network::InterfaceConfigBuilders +namespace](https://github.com/yast/yast-network/tree/843f75bfdb71d4026b3f97facf18eece479b8a0e/src/lib/y2network/interface_config_builders). + +### Widgets -AutoYaST is somehow and special case, as the configuration is read from the profile instead of the -running system. So in this scenario, YaST2 Network will read the configuration using the `Autoinst` -reader and will write it to the final system using the one corresponding to the wanted backend. +The user interaction is driven by a set of sequences, which determine which dialogs are shown to the +user. Each of those dialogs contain a set of widgets, usually grouped in tabs. The content of the +dialog depends on the interface type. + +Below you can find some pointers to relevant sequences, dialogs and widgets: + +* Sequences: + * [Sequences::Interface](https://github.com/yast/yast-network/blob/358bcd13b4e92e7c4e9c0e477c83196ca67b578e/src/lib/y2network/sequences/interface.rb) +* Dialogs: + * [Dialogs::AddInterface](https://github.com/yast/yast-network/blob/358bcd13b4e92e7c4e9c0e477c83196ca67b578e/src/lib/y2network/dialogs/add_interface.rb) + * [Dialogs::EditInterface](https://github.com/yast/yast-network/blob/358bcd13b4e92e7c4e9c0e477c83196ca67b578e/src/lib/y2network/dialogs/edit_interface.rb) +* [Y2Network::Widgets](https://github.com/yast/yast-network/tree/358bcd13b4e92e7c4e9c0e477c83196ca67b578e/src/lib/y2network/widgets) ## Current Status @@ -145,3 +170,9 @@ reader and will write it to the final system using the one corresponding to the | USB | | | | Dummy | | | | s390 types | | | + +## (Short Term) Plan + +- [ ] Finish reading/writing interfaces +- [ ] Move missing UI logic to interface configuration builders +- [ ] Replace LanItems with the new data model From ec625ab68532fece2183ef06185b7c1e1f3bb9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 19 Jul 2019 11:30:46 +0100 Subject: [PATCH 032/471] Update from code review --- src/lib/y2network/sysconfig/interface_file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index eaf86c79e..685dc37f1 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -125,7 +125,7 @@ def params # @return [Integer] Length in bits for all keys used define_parameter(:wireless_key_length, :integer) - # @return [Integer] Number of supported keys + # Number of supported keys SUPPORTED_KEYS = 4 define_array_parameter(:wireless_key, SUPPORTED_KEYS, :string) From 059ac482b2be24533513523a59b13391bceeff28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 19 Jul 2019 11:38:22 +0100 Subject: [PATCH 033/471] Add support for multi values variables in InterfaceFile * Add a #load method to read the file's content (a more CFA-like API). --- .../sysconfig/connection_config_reader.rb | 1 + src/lib/y2network/sysconfig/interface_file.rb | 164 +++++++++++------- .../connection_config_reader_test.rb | 2 +- .../sysconfig/interface_file_test.rb | 18 +- 4 files changed, 113 insertions(+), 72 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_reader.rb b/src/lib/y2network/sysconfig/connection_config_reader.rb index 8d0704f31..6506366d1 100644 --- a/src/lib/y2network/sysconfig/connection_config_reader.rb +++ b/src/lib/y2network/sysconfig/connection_config_reader.rb @@ -34,6 +34,7 @@ class ConnectionConfigReader # @return [Y2Network::ConnectionConfig::Base] def read(name, type) file = Y2Network::Sysconfig::InterfaceFile.new(name) + file.load handler_class = find_handler_class(type || file.type) return nil if handler_class.nil? handler_class.new(file).connection_config diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 685dc37f1..64976da03 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -25,10 +25,16 @@ module Y2Network module Sysconfig # This class represents a sysconfig file containing an interface configuration # + # The configuration is defined by a set of variables that are included in the file. + # Check ifcfg(5) for further information. + # # @example Finding the file for a given interface # file = Y2Network::Sysconfig::InterfaceFile.find("wlan0") # file.wireless_essid #=> "dummy" class InterfaceFile + # Auxiliar class to hold variables definition information + Variable = Struct.new(:name, :type, :collection?) + # @return [String] Interface name class << self SYSCONFIG_NETWORK_DIR = Pathname.new("/etc/sysconfig/network").freeze @@ -44,60 +50,61 @@ def find(interface) # Defines a parameter # - # This method adds a pair of methods to get and set the parameter's value. + # This method registers the parameter and adds a pair of methods to get and set its + # value. # # @param param_name [Symbol] Parameter name - # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) + # @param type [Symbol] Parameter type (:string, :integer, :symbol, :ipaddr) def define_parameter(param_name, type = :string) - params << param_name + name = variable_name(param_name) + variables[name] = Variable.new(name, type, false) define_method param_name do - return @values[param_name] if @values.key?(param_name) - value = fetch(param_name.to_s.upcase) - send("value_as_#{type}", value) + @values[name] end define_method "#{param_name}=" do |value| # The `value` should be an object which responds to #to_s so its value can be written to # the ifcfg file. - @values[param_name] = value + @values[name] = value end end # Defines an array parameter # - # This method adds a pair of methods to get and set the parameter's values. + # This method registers the parameter and adds a pair of methods to get and set its + # value. In this case, the parameter is an array. # # @param param_name [Symbol] Parameter name - # @param limit [Integer] Maximum array size - # @param type [Symbol] Type to be used (:string, :integer, :symbol, :ipaddr) - def define_array_parameter(param_name, limit, type = :string) - params << param_name + # @param type [Symbol] Array elements type (:string, :integer, :symbol, :ipaddr) + def define_array_parameter(param_name, type = :string) + name = variable_name(param_name) + variables[name] = Variable.new(name, type, true) define_method "#{param_name}s" do - return @values[param_name] if @values.key?(param_name) - key = param_name.to_s.upcase - values = [fetch(key)] - values += Array.new(limit) do |idx| - value = fetch("#{key}_#{idx}") - next if value.nil? - send("value_as_#{type}", value) - end - values.compact + @values[name] end define_method "#{param_name}s=" do |value| - @values[param_name] = value + @values[name] = value end end - # Known configuration attributes/parameters + # Known configuration variables # - # A parameter is defined by using {define_parameter} or {define_array_parameter} methods. + # A variable is defined by using {define_parameter} or {define_array_parameter} methods. # # @return [Array] - def params - @params ||= [] + def variables + @variables ||= {} + end + + # Parameter name to internal variable name + # + # @param param_name [Symbol] + # @return [String] Convert a parameter name to the expected internal name + def variable_name(param_name) + param_name.to_s.upcase end end @@ -106,7 +113,7 @@ def params # !@attribute [r] ipaddr # return [Y2Network::IPAddress] IP address - define_parameter(:ipaddr, :ipaddr) + define_array_parameter(:ipaddr, :ipaddr) # !@attribute [r] name # return [String] Interface's description (e.g., "Ethernet Card 0") @@ -125,10 +132,9 @@ def params # @return [Integer] Length in bits for all keys used define_parameter(:wireless_key_length, :integer) - # Number of supported keys - SUPPORTED_KEYS = 4 - - define_array_parameter(:wireless_key, SUPPORTED_KEYS, :string) + # !@attribute [r] wireless_keys + # @return [Array] List of wireless keys + define_array_parameter(:wireless_key, :string) # !@attribute [r] wireless_default_key # @return [Integer] Index of the default key @@ -200,35 +206,24 @@ def path SYSCONFIG_NETWORK_PATH.join("ifcfg-#{interface}") end - # Returns the IP address if defined - # - # @return [IPAddr,nil] IP address or nil if it is not defined - def ip_address - str = fetch("IPADDR") - str.nil? || str.empty? ? nil : IPAddress.new(str) - end - alias_method :ip_address, :ipaddr - - # Fetches a key + # Loads values from the configuration file # - # @param key [String] Interface key - # @return [Object] Value for the given key - def fetch(key) - path = Yast::Path.new(".network.value.\"#{interface}\".#{key}") - Yast::SCR.Read(path) + # @return [Hash] All values from the file + def load + @values = self.class.variables.values.each_with_object({}) do |variable, hash| + meth = variable.collection? ? :fetch_collection : :fetch_scalar + hash[variable.name] = send(meth, variable.name, variable.type) + end end # Writes the changes to the file # # @note Writes only changed values, keeping the rest as they are. def save - @values.each do |key, value| - normalized_key = key.upcase - if value.is_a?(Array) - write_array(normalized_key, value) - else - write(normalized_key, value) - end + self.class.variables.keys.each do |name| + value = @values[name] + meth = value.is_a?(Hash) ? :write_collection : :write_scalar + send(meth, name, value) end Yast::SCR.Write(Yast::Path.new(".network"), nil) end @@ -244,13 +239,63 @@ def type # Empties all known values # - # This idea is to use this method to clear all unneeded values from interface files. + # This method clears all values from the file. The idea is to use this method + # to do some clean-up before writing the final values. def clean - @values = self.class.params.each_with_object({}) { |e, h| h[e] = nil } + @values = self.class.variables.each_with_object({}) { |e, h| h[e] = nil } end private + # Returns a list of those keys that have a value + # + # @return [Array] name of keys that are included in the file + def defined_variables + @defined_variables ||= Yast::SCR.Dir(Yast::Path.new(".network.value.\"#{interface}\"")) + end + + # Fetches the value for a given key + # + # @param key [String] Value key + # @param type [Symbol] Type to convert the value to + # @return [Object] Value for the given key + def fetch_scalar(key, type) + path = Yast::Path.new(".network.value.\"#{interface}\".#{key}") + value = Yast::SCR.Read(path) + send("value_as_#{type}", value) + end + + # Returns a hash containing all the values for a given key + # + # When working with collections, all values are represented in a hash, indexed by the suffix. + # + # For instance, this set of IPADDR_* keys: + # + # IPADDR='192.168.122.1' + # IPADDR_SEC='192.168.122.2' + # + # will be represented like: + # + # { :default => "192.168.122.1", "SEC" => "192.168.122.2" } + # + # @param key [Symbol] Key base name (without the suffix) + # @param type [Symbol] Type to convert the values to + # @return [Hash] + # TODO: simplify + def fetch_collection(key, type) + prefix = "#{key}_" + collection_keys = defined_variables.select do |k| + k == key || k.start_with?(prefix) + end + other_keys = self.class.variables.keys - [key] + collection_keys = collection_keys - other_keys + + collection_keys.each_with_object({}) do |k, h| + index = key == k ? :default : k.sub(prefix, "") + h[index] = fetch_scalar(k, type) + end + end + # Converts the value into a string (or nil if empty) # # @param [String] value @@ -287,9 +332,10 @@ def value_as_ipaddr(value) # # @param key [Symbol] Key # @param values [Array<#to_s>] Values to write - def write_array(key, values) - values.each_with_index do |value, idx| - write("#{key}_#{idx}", value) + def write_collection(key, values) + values.each do |suffix, value| + write_key = suffix == :default ? key : "#{key}_#{suffix}" + write_scalar(write_key, value) end end @@ -297,7 +343,7 @@ def write_array(key, values) # # @param key [Symbol] Key # @param value [#to_s] Value to write - def write(key, value) + def write_scalar(key, value) raw_value = value ? value.to_s : nil path = Yast::Path.new(".network.value.\"#{interface}\".#{key}") Yast::SCR.Write(path, raw_value) diff --git a/test/y2network/sysconfig/connection_config_reader_test.rb b/test/y2network/sysconfig/connection_config_reader_test.rb index 17b77c5e5..92fadd182 100644 --- a/test/y2network/sysconfig/connection_config_reader_test.rb +++ b/test/y2network/sysconfig/connection_config_reader_test.rb @@ -62,7 +62,7 @@ context "when the interface type is unknown" do let(:interface_file) do - instance_double(Y2Network::Sysconfig::InterfaceFile, type: :foo) + instance_double(Y2Network::Sysconfig::InterfaceFile, type: :foo).as_null_object end it "raise exception" do diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 0c846f49f..5fb3cf7d4 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -22,7 +22,7 @@ require "tmpdir" describe Y2Network::Sysconfig::InterfaceFile do - subject(:file) { described_class.new(interface_name) } + subject(:file) { described_class.new(interface_name).tap { |f| f.load } } let(:interface_name) { "eth0" } @@ -56,12 +56,6 @@ def file_content(scr_root, file) end end - describe "#fetch" do - it "returns the raw value from the sysconfig file" do - expect(file.fetch("IPADDR")).to eq("192.168.123.1/24") - end - end - describe "#ip_address" do it "returns the IP address" do expect(file.ip_address).to eq(Y2Network::IPAddress.from_string("192.168.123.1/24")) @@ -120,15 +114,15 @@ def file_content(scr_root, file) end describe "#wireless_keys" do - subject(:file) { described_class.new("wlan0") } + let(:interface_name) { "wlan0" } it "returns the list of keys" do - expect(file.wireless_keys).to eq(["0-1-2-3-4-5", "s:password"]) + expect(file.wireless_keys).to eq(default: "0-1-2-3-4-5", "1" => "s:password") end end describe "#wireless_keys=" do - let(:keys) { ["123456", "abcdef"] } + let(:keys) { { default: "123456", "1" => "abcdef" } } it "sets the wireless keys" do expect { file.wireless_keys = keys }.to change { file.wireless_keys }.to(keys) @@ -150,11 +144,11 @@ def file_content(scr_root, file) describe "when multiple wireless keys are specified" do it "writes indexes keys" do - file.wireless_keys = ["123456", "abcdef"] + file.wireless_keys = { :default => "123456", "1" => "abcdef" } file.save content = file_content(scr_root, file) - expect(content).to include("WIRELESS_KEY_0='123456") + expect(content).to include("WIRELESS_KEY='123456") expect(content).to include("WIRELESS_KEY_1='abcdef") end end From 381fbd4c026001ccafd7f0d8c0339d54f322ac0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 17 Jul 2019 12:58:27 +0100 Subject: [PATCH 034/471] Add missing variables from ifcfg-* files --- src/lib/y2network/sysconfig/interface_file.rb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 64976da03..acc96df61 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -128,6 +128,29 @@ def variable_name(param_name) # return [Symbol] When the interface should be set up (:manual, :auto, :hotplug, :nfsroot, :off) define_parameter(:startmode, :symbol) + # !@attribute [r] scopes + # @return [Hash] Scopes of the area where addresses are valid (:global, :site, :link, :host) + define_array_parameter(:scope, :symbol) + + # !@attribute [r] labels + # @return [Hash] Label to assign to the address + define_array_parameter(:label, :symbol) + + # !@attribute [r] remote_ipaddrs + # @return [Hash] Remote IP address of a point to point connection + define_array_parameter(:remote_ipaddr, :ipaddr) + + # !@attribute [r] broadcasts + # @return [Hash] Broadcasts addresses + define_array_parameter(:broadcast, :ipaddr) + + # !@attribute [r] prefixlens + # @return [Hash] Prefixes lengths + define_array_parameter(:prefixlen, :ipaddr) + + # !@attribute [r] netmasks + # @return [Hash] Netmasks + define_array_parameter(:netmask, :ipaddr) # !@attribute [r] wireless_key_length # @return [Integer] Length in bits for all keys used define_parameter(:wireless_key_length, :integer) From e792bd972204398e1e923db0f6e763a2790b9861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 17 Jul 2019 16:10:18 +0100 Subject: [PATCH 035/471] Normalize symbol values from InterfaceFile --- src/lib/y2network/sysconfig/interface_file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index acc96df61..708c0755a 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -340,7 +340,7 @@ def value_as_integer(value) # @param [String] value # @return [Symbol,nil] def value_as_symbol(value) - value.nil? || value.empty? ? nil : value.to_sym + value.nil? || value.empty? ? nil : value.downcase.to_sym end # Converts the value into a IPAddress (or nil if empty) From 9d4ed14804381219c901ff73277a29002ed8fb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 17 Jul 2019 16:36:36 +0100 Subject: [PATCH 036/471] Fix InterfaceFile tests --- .../sysconfig/interface_file_test.rb | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 5fb3cf7d4..fc25e7402 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -56,32 +56,40 @@ def file_content(scr_root, file) end end - describe "#ip_address" do - it "returns the IP address" do - expect(file.ip_address).to eq(Y2Network::IPAddress.from_string("192.168.123.1/24")) + describe "#ipaddrs" do + it "returns the IP addresses" do + expect(file.ipaddrs).to eq( + default: Y2Network::IPAddress.from_string("192.168.123.1/24") + ) end - context "when the IP address is empty" do + context "when multiple addresses are defined" do let(:interface_name) { "eth1" } - it "returns nil" do - expect(file.ip_address).to be_nil + it "returns a hash with IP addresses indexed by their suffixes" do + expect(file.ipaddrs).to eq( + "0" => Y2Network::IPAddress.from_string("192.168.123.1/24"), + "1" => Y2Network::IPAddress.from_string("10.0.0.1"), + ) end end context "when the IP address is missing" do let(:interface_name) { "eth2" } - it "returns nil" do - expect(file.ip_address).to be_nil + it "returns an empty hash" do + expect(file.ipaddrs).to be_empty end end end - describe "#ipaddr=" do + describe "#ipaddrs=" do + let(:interface_name) { "eth2" } + it "sets the bootproto" do - expect { file.ipaddr = Y2Network::IPAddress.from_string("10.0.0.1") } - .to change { file.ipaddr }.to(Y2Network::IPAddress.from_string("10.0.0.1")) + addresses = { default: Y2Network::IPAddress.from_string("10.0.0.1")} + expect { file.ipaddrs = addresses } + .to change { file.ipaddrs }.from({}).to(addresses) end end @@ -114,7 +122,7 @@ def file_content(scr_root, file) end describe "#wireless_keys" do - let(:interface_name) { "wlan0" } + let(:interface_name) { "wlan2" } it "returns the list of keys" do expect(file.wireless_keys).to eq(default: "0-1-2-3-4-5", "1" => "s:password") @@ -133,7 +141,7 @@ def file_content(scr_root, file) subject(:file) { described_class.new("eth0") } it "writes the changes to the file" do - file.ipaddr = Y2Network::IPAddress.from_string("192.168.122.1/24") + file.ipaddrs = { default: Y2Network::IPAddress.from_string("192.168.122.1/24") } file.bootproto = :static file.save From 5f232e724e2e1efca8aba8d7acb27a8973a3ca08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 18 Jul 2019 16:15:22 +0100 Subject: [PATCH 037/471] Improve InterfaceFile documentation --- src/lib/y2network/sysconfig/interface_file.rb | 101 +++++++++++------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 708c0755a..8f10e4538 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -31,6 +31,19 @@ module Sysconfig # @example Finding the file for a given interface # file = Y2Network::Sysconfig::InterfaceFile.find("wlan0") # file.wireless_essid #=> "dummy" + # + # ## Multivalued variables + # + # When dealing with multivalued variables, values are returned in a hash which + # indexes are the suffixes. For instance: + # + # IPADDR='192.168.122.1/24' + # IPADDR_EXTRA='192.168.123.1/24' + # IPADDR_ALT='10.0.0.1/8' + # + # @example Reading multivalued variables + # file = Y2Network::Sysconfig::InterfaceFile.find("wlan0") + # file.ipaddrs #=> { default: #, "EXTRA" => #, "ALT" => # } class InterfaceFile # Auxiliar class to hold variables definition information Variable = Struct.new(:name, :type, :collection?) @@ -55,7 +68,7 @@ def find(interface) # # @param param_name [Symbol] Parameter name # @param type [Symbol] Parameter type (:string, :integer, :symbol, :ipaddr) - def define_parameter(param_name, type = :string) + def define_variable(param_name, type = :string) name = variable_name(param_name) variables[name] = Variable.new(name, type, false) @@ -77,7 +90,7 @@ def define_parameter(param_name, type = :string) # # @param param_name [Symbol] Parameter name # @param type [Symbol] Array elements type (:string, :integer, :symbol, :ipaddr) - def define_array_parameter(param_name, type = :string) + def define_collection_parameter(param_name, type = :string) name = variable_name(param_name) variables[name] = Variable.new(name, type, true) @@ -92,7 +105,7 @@ def define_array_parameter(param_name, type = :string) # Known configuration variables # - # A variable is defined by using {define_parameter} or {define_array_parameter} methods. + # A variable is defined by using {define_variable} or {define_collection_parameter} methods. # # @return [Array] def variables @@ -112,105 +125,105 @@ def variable_name(param_name) attr_reader :interface # !@attribute [r] ipaddr - # return [Y2Network::IPAddress] IP address - define_array_parameter(:ipaddr, :ipaddr) + # @return [Y2Network::IPAddress] IP address + define_collection_parameter(:ipaddr, :ipaddr) # !@attribute [r] name - # return [String] Interface's description (e.g., "Ethernet Card 0") - define_parameter(:name, :string) + # @return [String] Interface's description (e.g., "Ethernet Card 0") + define_variable(:name, :string) # !@attribute [r] bootproto - # return [Symbol] Set up protocol (:static, :dhcp, :dhcp4, :dhcp6, :autoip, :dhcp+autoip, + # @return [Symbol] Set up protocol (:static, :dhcp, :dhcp4, :dhcp6, :autoip, :dhcp+autoip, # :auto6, :6to4, :none) - define_parameter(:bootproto, :symbol) + define_variable(:bootproto, :symbol) # !@attribute [r] bootproto - # return [Symbol] When the interface should be set up (:manual, :auto, :hotplug, :nfsroot, :off) - define_parameter(:startmode, :symbol) + # @return [Symbol] When the interface should be set up (:manual, :auto, :hotplug, :nfsroot, :off) + define_variable(:startmode, :symbol) # !@attribute [r] scopes # @return [Hash] Scopes of the area where addresses are valid (:global, :site, :link, :host) - define_array_parameter(:scope, :symbol) + define_collection_parameter(:scope, :symbol) # !@attribute [r] labels # @return [Hash] Label to assign to the address - define_array_parameter(:label, :symbol) + define_collection_parameter(:label, :symbol) # !@attribute [r] remote_ipaddrs # @return [Hash] Remote IP address of a point to point connection - define_array_parameter(:remote_ipaddr, :ipaddr) + define_collection_parameter(:remote_ipaddr, :ipaddr) # !@attribute [r] broadcasts # @return [Hash] Broadcasts addresses - define_array_parameter(:broadcast, :ipaddr) + define_collection_parameter(:broadcast, :ipaddr) # !@attribute [r] prefixlens - # @return [Hash] Prefixes lengths - define_array_parameter(:prefixlen, :ipaddr) + # @return [Hash] Prefixes lengths + define_collection_parameter(:prefixlen, :ipaddr) # !@attribute [r] netmasks - # @return [Hash] Netmasks - define_array_parameter(:netmask, :ipaddr) + # @return [Hash] Netmasks + define_collection_parameter(:netmask, :ipaddr) # !@attribute [r] wireless_key_length # @return [Integer] Length in bits for all keys used - define_parameter(:wireless_key_length, :integer) + define_variable(:wireless_key_length, :integer) # !@attribute [r] wireless_keys # @return [Array] List of wireless keys - define_array_parameter(:wireless_key, :string) + define_collection_parameter(:wireless_key, :string) # !@attribute [r] wireless_default_key # @return [Integer] Index of the default key # @see #wireless_keys - define_parameter(:wireless_default_key, :integer) + define_variable(:wireless_default_key, :integer) # !@attribute [r] wireless_essid # @return [String] Wireless SSID/ESSID - define_parameter(:wireless_essid) + define_variable(:wireless_essid) # !@attribute [r] wireless_auth_mode # @return [Symbol] Wireless authorization mode (:open, :shared, :psk, :eap) - define_parameter(:wireless_auth_mode, :symbol) + define_variable(:wireless_auth_mode, :symbol) # @!attribute [r] wireless_mode # @return [Symbol] Operating mode for the device (:managed, :ad_hoc or :master) - define_parameter(:wireless_mode, :symbol) + define_variable(:wireless_mode, :symbol) # @!attribute [r] wireless_wpa_password # @return [String] Password as configured on the RADIUS server (for WPA-EAP) - define_parameter(:wireless_wpa_password) + define_variable(:wireless_wpa_password) # @!attribute [r] wireless_wpa_driver # @return [String] Driver to be used by the wpa_supplicant program - define_parameter(:wireless_wpa_driver) + define_variable(:wireless_wpa_driver) # @!attribute [r] wireless_wpa_psk # @return [String] WPA preshared key (for WPA-PSK) - define_parameter(:wireless_wpa_psk) + define_variable(:wireless_wpa_psk) # @!attribute [r] wireless_eap_mode # @return [String] WPA-EAP outer authentication method - define_parameter(:wireless_eap_mode) + define_variable(:wireless_eap_mode) # @!attribute [r] wireless_eap_auth # @return [String] WPA-EAP inner authentication with TLS tunnel method - define_parameter(:wireless_eap_auth) + define_variable(:wireless_eap_auth) # @!attribute [r] wireless_ap_scanmode # @return [String] SSID scan mode ("0", "1" and "2") - define_parameter(:wireless_ap_scanmode) + define_variable(:wireless_ap_scanmode) # @!attribute [r] wireless_ap # @return [String] AP MAC address - define_parameter(:wireless_ap) + define_variable(:wireless_ap) # @!attribute [r] wireless_channel # @return [Integer] Wireless channel - define_parameter(:wireless_channel) + define_variable(:wireless_channel) # @!attribute [r] wireless_nwid # @return [String] Network ID - define_parameter(:wireless_nwid) + define_variable(:wireless_nwid) # Constructor # @@ -265,7 +278,10 @@ def type # This method clears all values from the file. The idea is to use this method # to do some clean-up before writing the final values. def clean - @values = self.class.variables.each_with_object({}) { |e, h| h[e] = nil } + @values = self.class.variables.values.each_with_object({}) do |variable, hash| + hash[variable.name] = variable.collection? ? {} : nil + end + @defined_variables = nil end private @@ -306,17 +322,19 @@ def fetch_scalar(key, type) # @return [Hash] # TODO: simplify def fetch_collection(key, type) + collection_keys(key).each_with_object({}) do |k, h| + index = key == k ? :default : k.sub(prefix, "") + h[index] = fetch_scalar(k, type) + end + end + + def collection_keys(key) prefix = "#{key}_" collection_keys = defined_variables.select do |k| k == key || k.start_with?(prefix) end other_keys = self.class.variables.keys - [key] - collection_keys = collection_keys - other_keys - - collection_keys.each_with_object({}) do |k, h| - index = key == k ? :default : k.sub(prefix, "") - h[index] = fetch_scalar(k, type) - end + collection_keys - other_keys end # Converts the value into a string (or nil if empty) @@ -356,6 +374,7 @@ def value_as_ipaddr(value) # @param key [Symbol] Key # @param values [Array<#to_s>] Values to write def write_collection(key, values) + # clean old values values.each do |suffix, value| write_key = suffix == :default ? key : "#{key}_#{suffix}" write_scalar(write_key, value) From 38bd020f909431b76269208e85bc0eca91869d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 19 Jul 2019 06:21:22 +0100 Subject: [PATCH 038/471] Clear unneeded values from ifcfg-* files --- src/lib/y2network/sysconfig/interface_file.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 8f10e4538..1c0d921bd 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -371,16 +371,27 @@ def value_as_ipaddr(value) # Writes an array as a value for a given key # - # @param key [Symbol] Key + # @param key [String] Key # @param values [Array<#to_s>] Values to write + # @see #clean_collection def write_collection(key, values) - # clean old values + clean_collection(key) values.each do |suffix, value| write_key = suffix == :default ? key : "#{key}_#{suffix}" write_scalar(write_key, value) end end + # Cleans all values from a collection + # + # @todo There is no way to remove elements from the configuration file so we are setting them + # to blank. However, using CFA might be an alternative. + # + # @param key [String] Key + def clean_collection(key) + collection_keys(key).each { |k| write_scalar(k, "") } + end + # Writes the value for a given key # # @param key [Symbol] Key From 83d049bb66b079c859778875f6b997f9af44898d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 19 Jul 2019 06:25:38 +0100 Subject: [PATCH 039/471] Support ifcfg-* suffixes with no separators --- src/lib/y2network/sysconfig/interface_file.rb | 12 +++++------- test/y2network/sysconfig/interface_file_test.rb | 10 +++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 1c0d921bd..0c3829627 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -43,7 +43,7 @@ module Sysconfig # # @example Reading multivalued variables # file = Y2Network::Sysconfig::InterfaceFile.find("wlan0") - # file.ipaddrs #=> { default: #, "EXTRA" => #, "ALT" => # } + # file.ipaddrs #=> { default: #, "_EXTRA" => #, "_ALT" => # } class InterfaceFile # Auxiliar class to hold variables definition information Variable = Struct.new(:name, :type, :collection?) @@ -311,27 +311,25 @@ def fetch_scalar(key, type) # For instance, this set of IPADDR_* keys: # # IPADDR='192.168.122.1' - # IPADDR_SEC='192.168.122.2' + # IPADDR0='192.168.122.2' # # will be represented like: # - # { :default => "192.168.122.1", "SEC" => "192.168.122.2" } + # { :default => "192.168.122.1", "0" => "192.168.122.2" } # # @param key [Symbol] Key base name (without the suffix) # @param type [Symbol] Type to convert the values to # @return [Hash] - # TODO: simplify def fetch_collection(key, type) collection_keys(key).each_with_object({}) do |k, h| - index = key == k ? :default : k.sub(prefix, "") + index = key == k ? :default : k.sub(key, "") h[index] = fetch_scalar(k, type) end end def collection_keys(key) - prefix = "#{key}_" collection_keys = defined_variables.select do |k| - k == key || k.start_with?(prefix) + k == key || k.start_with?(key) end other_keys = self.class.variables.keys - [key] collection_keys - other_keys diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index fc25e7402..8695441d4 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -68,8 +68,8 @@ def file_content(scr_root, file) it "returns a hash with IP addresses indexed by their suffixes" do expect(file.ipaddrs).to eq( - "0" => Y2Network::IPAddress.from_string("192.168.123.1/24"), - "1" => Y2Network::IPAddress.from_string("10.0.0.1"), + "_0" => Y2Network::IPAddress.from_string("192.168.123.1/24"), + "_1" => Y2Network::IPAddress.from_string("10.0.0.1"), ) end end @@ -125,7 +125,7 @@ def file_content(scr_root, file) let(:interface_name) { "wlan2" } it "returns the list of keys" do - expect(file.wireless_keys).to eq(default: "0-1-2-3-4-5", "1" => "s:password") + expect(file.wireless_keys).to eq("_0" => "0-1-2-3-4-5", "_1" => "s:password") end end @@ -173,14 +173,14 @@ def file_content(scr_root, file) end describe "#clean" do - subject(:file) { described_class.new("eth0") } + let(:interface_name) { "eth1" } it "removes all known values from the file" do file.clean file.save content = file_content(scr_root, file) - expect(content).to include("BROADCAST=''") + expect(content).to match("IPADDR_0=''") end end end From 0afa0ab4f7e59497a7508116ce08427ce5bde1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 17 Jul 2019 12:59:23 +0100 Subject: [PATCH 040/471] Use a IPConfig class to hold IP configuration --- src/lib/y2network/connection_config/base.rb | 6 +-- .../y2network/connection_config/ip_config.rb | 52 +++++++++++++++++++ .../y2network/sysconfig/config_writer_test.rb | 4 +- 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/lib/y2network/connection_config/ip_config.rb diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index d20efbc42..0a3cbc572 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -42,10 +42,8 @@ class Base # @return [Symbol] Bootproto (static, dhcp, ,dhcp4, dhcp6, autoip, # dhcp+autoip, auto6, 6to4, none) attr_accessor :bootproto - # @return [IPAddr,nil] - attr_accessor :ip_address - # @return [Array] - attr_accessor :secondary_ip_addresses + # @return [Array] + attr_accessor :ip_configs # @return [Integer, nil] attr_accessor :mtu # @return [String] Connection's description (e.g., "Ethernet Card 0") diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb new file mode 100644 index 000000000..0a130f145 --- /dev/null +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -0,0 +1,52 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. +module Y2Network + module ConnectionConfig + class IPConfig + # @return [IPAddress] IP address + attr_accessor :address + # @return [Symbol] Address scope (:global, :site, :link or :host) + attr_accessor :scope + # @return [String,nil] Address label + attr_accessor :label + # @return [IPAddress,nil] Remote IP address of a point to point connection + attr_accessor :remote_address + # @return [IPAddress,nil] Broadcast address + attr_accessor :broadcast + + # Constructor + # + # @param address [IPAddress] + # @param id [Symbol,String] ID (needed for sysconfig backend in order to write suffixes in + # ifcfg-* files) + # @param scope [Symbol] + # @param label [String,nil] + # @param remote_address [IPaddress,nil] + # @param broadcast [IPaddress,nil] + def initialize(address:, id: nil, scope: nil, label: nil, remote_address: nil, broadcast: nil) + @address = address + @id = id || :default + @scope = scope || :global + @label = label + @remote_address = remote_address + @broadcast = broadcast + end + end + end +end diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index e92274575..29f40dd3b 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -25,6 +25,7 @@ require "y2network/routing_table" require "y2network/sysconfig_paths" require "y2network/connection_config/ethernet" +require "y2network/connection_config/ip_config" describe Y2Network::Sysconfig::ConfigWriter do subject(:writer) { described_class.new } @@ -39,12 +40,13 @@ ) end let(:old_config) { instance_double(Y2Network::Config, dns: double("dns"), interfaces: nil) } + let(:ip_config) { Y2Network::ConnectionConfig::IPConfig.new(address: IPAddr.new("192.168.122.2")) } let(:eth0) { Y2Network::Interface.new("eth0") } let(:eth0_conn) do Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| conn.interface = "eth0" conn.bootproto = :static - conn.ip_address = IPAddr.new("192.168.122.1") + conn.ip_configs = [ip_config] end end let(:route) do From 57485391fda1c2ef3bdb3a88b711c5b0fc1a474d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 19 Jul 2019 09:53:13 +0100 Subject: [PATCH 041/471] Fix InterfacesReader test --- .../sysconfig/interfaces_reader_test.rb | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index 9274c9646..8d7f18d9f 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -35,34 +35,17 @@ let(:configured_interfaces) { ["lo", "eth0"] } TYPES = { "eth0" => "eth" }.freeze - IFCFGS = { - "eth0" => { - "BOOTPROTO" => "static", - "IPADDR" => "192.168.1.2" - }, - "eth1" => { - "BOOTPROTO" => "static", - "IPADDR" => "10.0.0.2" - } - }.freeze - SCR_PATH_REGEXP = /.network.value.\"(\w+)\".(\w+)\Z/ before do allow(Yast::LanItems).to receive(:Hardware).and_return(netcards) allow(Yast::SCR).to receive(:Dir).with(Yast::Path.new(".network.section")) .and_return(configured_interfaces) + allow(Yast::SCR).to receive(:Dir).and_call_original allow(Yast::NetworkInterfaces).to receive(:GetTypeFromSysfs) { |n| TYPES[n] } - allow(Yast::SCR).to receive(:Read) do |path, &block| - m = SCR_PATH_REGEXP.match(path.to_s) - if m - iface, key = m[1..2] - IFCFGS[iface][key] - else - block.call - end - end end + around { |e| change_scr_root(File.join(DATA_PATH, "scr_read"), &e) } + describe "#interfaces" do it "reads physical interfaces" do interfaces = reader.interfaces From 0d0cab8755f950b95294f1c04546503f6116de0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 17 Jul 2019 13:31:19 +0100 Subject: [PATCH 042/471] Add support for multiple IPs in Ethernet connections --- src/lib/y2network/ip_address.rb | 2 +- .../connection_config_readers/base.rb | 58 +++++++++++++++++++ .../connection_config_readers/ethernet.rb | 15 +---- .../ethernet_test.rb | 16 +++-- 4 files changed, 69 insertions(+), 22 deletions(-) create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/base.rb diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index 836e12081..8de535f9b 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -42,7 +42,7 @@ class IPAddress # @return [IPAddr] IP address attr_reader :address # @return [Integer] Prefix - attr_reader :prefix + attr_accessor :prefix def_delegators :@address, :ipv4?, :ipv6? diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb new file mode 100644 index 000000000..4d55bd42c --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -0,0 +1,58 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/ip_config" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This is the base class for connection config readers + class Base + # @return [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file + attr_reader :file + + # Constructor + # + # @param file [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file + def initialize(file) + @file = file + end + + # Returns the IPs configuration from the file + # + # @return [Array] IP addresses configuration + # @see Y2Network::ConnectionConfig::IPConfig + def ip_configs + file.ipaddrs.map do |id, ip| + prefix = file.prefixlens[id] + ip.prefix = prefix if prefix + Y2Network::ConnectionConfig::IPConfig.new( + id: id, + address: ip, + scope: file.scopes[id], + label: file.labels[id], + remote_address: file.remote_ipaddrs[id], + broadcast: file.broadcasts[id] + ) + end + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb index 54c6a4b26..3665e32bc 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb @@ -17,6 +17,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "y2network/sysconfig/connection_config_readers/base" require "y2network/connection_config/ethernet" module Y2Network @@ -24,24 +25,14 @@ module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Ethernet object given a # Sysconfig::InterfaceFile object. - class Ethernet - # @return [Y2Network::Sysconfig::InterfaceFile] - attr_reader :file - - # Constructor - # - # @param file [Y2Network::Sysconfig::InterfaceFile] File to get interface configuration from - def initialize(file) - @file = file - end - + class Ethernet < Base # @return [Y2Network::ConnectionConfig::Ethernet] def connection_config Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| conn.bootproto = file.bootproto conn.description = file.name conn.interface = file.interface - conn.ip_address = file.ip_address + conn.ip_configs = ip_configs end end end diff --git a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb index bb236181f..8ac19e847 100644 --- a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb @@ -24,16 +24,14 @@ describe Y2Network::Sysconfig::ConnectionConfigReaders::Ethernet do subject(:handler) { described_class.new(file) } - let(:address) { IPAddr.new("192.168.122.1") } + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end let(:file) do - instance_double( - Y2Network::Sysconfig::InterfaceFile, - interface: "eth0", - name: "Ethernet Card 0", - bootproto: :static, - ip_address: address - ) + Y2Network::Sysconfig::InterfaceFile.find("eth0").tap(&:load) end describe "#connection_config" do @@ -41,7 +39,7 @@ eth = handler.connection_config expect(eth.interface).to eq("eth0") expect(eth.bootproto).to eq(:static) - expect(eth.ip_address).to eq(address) + expect(eth.ip_configs.map(&:address)).to eq([Y2Network::IPAddress.from_string("192.168.123.1/24")]) end end end From d5261455fc269e2ad2f5586a1f6c82ba448370f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 17 Jul 2019 16:09:17 +0100 Subject: [PATCH 043/471] Add support for multiple IPs in Wireless connections --- .../connection_config_readers/wireless.rb | 24 +++-- .../etc/sysconfig/network/ifcfg-wlan0 | 13 +-- .../etc/sysconfig/network/ifcfg-wlan1 | 11 +++ .../etc/sysconfig/network/ifcfg-wlan2 | 12 +++ .../etc/sysconfig/network/ifcfg-wlan3 | 6 ++ .../wireless_test.rb | 94 ++++--------------- 6 files changed, 68 insertions(+), 92 deletions(-) create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-wlan1 create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-wlan2 create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-wlan3 diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 90e6e765f..e0540698d 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -17,6 +17,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "y2network/sysconfig/connection_config_readers/base" require "y2network/connection_config/wireless" module Y2Network @@ -24,14 +25,7 @@ module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Wireless object given a # Sysconfig::InterfaceFile object. - class Wireless - # @return [Y2Network::Sysconfig::InterfaceFile] - attr_reader :file - - def initialize(file) - @file = file - end - + class Wireless < Base # Returns a wireless connection configuration # # @return [ConnectionConfig::Wireless] @@ -47,15 +41,25 @@ def connection_config conn.eap_mode = file.wireless_eap_mode conn.essid = file.wireless_essid conn.interface = file.interface - conn.ip_address = file.ip_address + conn.ip_configs = ip_configs conn.key_length = file.wireless_key_length - conn.keys = file.wireless_keys + conn.keys = wireless_keys conn.mode = file.wireless_mode conn.nwid = file.wireless_nwid conn.wpa_password = file.wireless_wpa_password conn.wpa_psk = file.wireless_wpa_psk end end + + private + + # Max number of wireless keys + MAX_WIRELESS_KEYS = 4 + + # Reads the array of wireless keys from the file + def wireless_keys + (0..MAX_WIRELESS_KEYS - 1).map { |i| file.wireless_keys["_#{i}"] } + end end end end diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan0 index 1a7203eea..6ecc0b49d 100644 --- a/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan0 +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan0 @@ -1,11 +1,12 @@ +# WPA-EAP network configuration BOOTPROTO='static' BROADCAST='' NAME='Wireless Adapter 0' STARTMODE='auto' -WIRELESS_AUTH_MODE='shared' -WIRELESS_DEFAULT_KEY='2' +WIRELESS_AUTH_MODE='eap' +WIRELESS_EAP_MODE='PEAP' +WIRELESS_EAP_AUTH='mschapv2' +WIRELESS_WPA_PASSWORD='example_passwd' WIRELESS_ESSID='example_ssid' -WIRELESS_KEY="0-1-2-3-4-5" -WIRELESS_KEY_1="s:password" -WIRELESS_KEY_LENGTH='128' -WIRELESS_MODE='Managed' \ No newline at end of file +WIRELESS_MODE='Managed' +WIRELESS_AP_SCANMODE='1' diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan1 b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan1 new file mode 100644 index 000000000..86828d60f --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan1 @@ -0,0 +1,11 @@ +# WPA-PSK network configuration +BOOTPROTO='static' +BROADCAST='' +NAME='Wireless Adapter 1' +STARTMODE='auto' +WIRELESS_AUTH_MODE='psk' +WIRELESS_ESSID='example_ssid' +WIRELESS_WPA_PSK='example_psk' +WIRELESS_MODE='Managed' +WIRELESS_AP_SCANMODE='1' +WIRELESS_AP='00:11:22:33:44:55' diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan2 b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan2 new file mode 100644 index 000000000..c4bd98c79 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan2 @@ -0,0 +1,12 @@ +# WEP network configuration +BOOTPROTO='static' +BROADCAST='' +NAME='Wireless Adapter 2' +STARTMODE='auto' +WIRELESS_AUTH_MODE='shared' +WIRELESS_DEFAULT_KEY='1' +WIRELESS_ESSID='example_ssid' +WIRELESS_KEY_0="0-1-2-3-4-5" +WIRELESS_KEY_1="s:password" +WIRELESS_KEY_LENGTH='128' +WIRELESS_MODE='Managed' \ No newline at end of file diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan3 b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan3 new file mode 100644 index 000000000..cec0e83e5 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-wlan3 @@ -0,0 +1,6 @@ +BOOTPROTO='static' +BROADCAST='' +NAME='Wireless Adapter 3' +STARTMODE='auto' +WIRELESS_AUTH_MODE='open' +WIRELESS_MODE='Managed' \ No newline at end of file diff --git a/test/y2network/sysconfig/connection_config_readers/wireless_test.rb b/test/y2network/sysconfig/connection_config_readers/wireless_test.rb index 1a956b624..c8b458173 100644 --- a/test/y2network/sysconfig/connection_config_readers/wireless_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/wireless_test.rb @@ -24,39 +24,20 @@ describe Y2Network::Sysconfig::ConnectionConfigReaders::Wireless do subject(:handler) { described_class.new(file) } - let(:address) { IPAddr.new("192.168.122.1") } + let(:interface_name) { "wlan0" } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end let(:file) do - instance_double( - Y2Network::Sysconfig::InterfaceFile, - interface: "wlan0", - name: "Wireless Card 0", - startmode: :auto, - bootproto: :static, - ip_address: address, - wireless_keys: ["0-1-2-3-4-5", "s:password"], - wireless_default_key: 1, - wireless_key_length: 128 - ).as_null_object + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) end context "WPA-EAP network configuration" do - let(:file) do - instance_double( - Y2Network::Sysconfig::InterfaceFile, - interface: "wlan0", - name: "Wireless Card 0", - bootproto: :static, - ip_address: address, - wireless_auth_mode: "eap", - wireless_eap_mode: "PEAP", - wireless_eap_auth: "mschapv2", - wireless_essid: "example_ssid", - wireless_mode: "Managed", - wireless_wpa_password: "example_passwd", - wireless_ap_scanmode: "1" - ).as_null_object - end + let(:interface_name) { "wlan0" } it "returns a wireless connection config object" do wlan = handler.connection_config @@ -67,10 +48,10 @@ wlan = handler.connection_config expect(wlan).to have_attributes( interface: "wlan0", - mode: "Managed", + mode: :managed, essid: "example_ssid", ap_scanmode: "1", - auth_mode: "eap", + auth_mode: :eap, eap_mode: "PEAP", eap_auth: "mschapv2", wpa_password: "example_passwd" @@ -79,25 +60,7 @@ end context "WPA-PSK network configuration" do - let(:wireless_attributes) do - COMMON_PARAMETERS.merge( - "WIRELESS_AP" => "00:11:22:33:44:55", - "WIRELESS_AUTH_MODE" => "psk", - "WIRELESS_ESSID" => "example_ssid", - "WIRELESS_WPA_PSK" => "example_psk" - ) - end - let(:file) do - instance_double( - Y2Network::Sysconfig::InterfaceFile, - interface: "wlan0", - name: "Wireless Card 0", - bootproto: :static, - wireless_ap: "00:11:22:33:44:55", - wireless_auth_mode: "psk", - wireless_wpa_psk: "example_psk" - ).as_null_object - end + let(:interface_name) { "wlan1" } it "returns a wireless connection config object" do wlan = handler.connection_config @@ -107,8 +70,8 @@ it "sets relevant attributes" do wlan = handler.connection_config expect(wlan).to have_attributes( - interface: "wlan0", - auth_mode: "psk", + interface: "wlan1", + auth_mode: :psk, wpa_psk: "example_psk", ap: "00:11:22:33:44:55" ) @@ -116,20 +79,7 @@ end context "WEP network configuration" do - let(:file) do - instance_double( - Y2Network::Sysconfig::InterfaceFile, - interface: "wlan0", - name: "Wireless Card 0", - bootproto: :static, - ip_address: address, - wireless_auth_mode: "shared", - wireless_essid: "example_ssid", - wireless_keys: ["0-1-2-3-4-5", "s:password"], - wireless_key_length: 128, - wireless_default_key: 1 - ).as_null_object - end + let(:interface_name) { "wlan2" } it "returns a wireless connection config object" do wlan = handler.connection_config @@ -139,9 +89,9 @@ it "sets relevant attributes" do wlan = handler.connection_config expect(wlan).to have_attributes( - interface: "wlan0", + interface: "wlan2", essid: "example_ssid", - keys: ["0-1-2-3-4-5", "s:password"], + keys: ["0-1-2-3-4-5", "s:password", nil, nil], key_length: 128, default_key: 1 ) @@ -149,15 +99,7 @@ end context "open network configuration" do - let(:file) do - instance_double( - Y2Network::Sysconfig::InterfaceFile, - interface: "wlan0", - name: "Wireless Card 0", - wireless_auth_mode: :open, - wireless_mode: :managed - ).as_null_object - end + let(:interface_name) { "wlan3" } it "returns a wireless connection object" do wlan = handler.connection_config From 87a189fb2d7e4264204b3a9c314e748e76e3487f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 15:03:58 +0200 Subject: [PATCH 044/471] add comparison operator --- src/lib/y2network/startmode.rb | 4 ++++ src/lib/y2network/startmodes/ifplugd.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/lib/y2network/startmode.rb b/src/lib/y2network/startmode.rb index 12c8277a9..bb5a68f00 100644 --- a/src/lib/y2network/startmode.rb +++ b/src/lib/y2network/startmode.rb @@ -41,5 +41,9 @@ def self.all require "y2network/startmodes" Startmodes.constants.map { |c| Startmodes.const_get(c).new } end + + def ==(other) + name == other.name + end end end diff --git a/src/lib/y2network/startmodes/ifplugd.rb b/src/lib/y2network/startmodes/ifplugd.rb index 397158619..d9f063205 100644 --- a/src/lib/y2network/startmodes/ifplugd.rb +++ b/src/lib/y2network/startmodes/ifplugd.rb @@ -36,6 +36,10 @@ def initialize def to_human_string _("On Cable Connection") end + + def ==(other) + name == other.name && priority == other.priority + end end end end From 0f0de2b81594be77ef6dccaef74d8256ed930bdc Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 15:23:27 +0200 Subject: [PATCH 045/471] add dhcp method --- src/lib/y2network/boot_protocol.rb | 5 +++++ src/modules/LanItems.rb | 9 +++++++-- test/y2network/boot_protocol_test.rb | 8 ++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/boot_protocol.rb b/src/lib/y2network/boot_protocol.rb index b961b0bff..f079222c3 100644 --- a/src/lib/y2network/boot_protocol.rb +++ b/src/lib/y2network/boot_protocol.rb @@ -51,6 +51,11 @@ def initialize(name) @name = name end + # checks if boot protocol is at least partially configured by dhcp + def dhcp? + [DHCP4, DHCP6, DHCP, DHCP_AUTOIP].include?(self) + end + # iBFT boot protocol IBFT = new("ibft") # statically assigned interface properties diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 108f836c6..a7e173339 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -28,6 +28,7 @@ require "network/wicked" require "network/lan_items_summary" require "y2network/config" +require "y2network/boot_protocol" require "shellwords" @@ -1396,14 +1397,18 @@ def isCurrentHotplug # from DHCP (v4, v6 or both) # @return true if it is def isCurrentDHCP - Builtins.regexpmatch(@bootproto, "dhcp[46]?") + return false unless @bootproto + + Y2Network::BootProtocol.from_name(@bootproto).dhcp? end # Checks whether given device configuration is set to use a dhcp bootproto # # ideally should replace @see isCurrentDHCP def dhcp?(devmap) - ["dhcp4", "dhcp6", "dhcp", "dhcp+autoip"].include?(devmap["BOOTPROTO"]) + return false unless devmap["BOOTPROTO"] + + Y2Network::BootProtocol.from_name(devmap["BOOTPROTO"]).dhcp? end def GetItemDescription diff --git a/test/y2network/boot_protocol_test.rb b/test/y2network/boot_protocol_test.rb index e19b7a564..0d62dcc29 100644 --- a/test/y2network/boot_protocol_test.rb +++ b/test/y2network/boot_protocol_test.rb @@ -40,5 +40,13 @@ expect(described_class.from_name("dhcp8")).to eq nil end end + + describe "#dhcp?" do + it "returns true if protocol at least partially is read from dhcp" do + expect(Y2Network::BootProtocol::DHCP4.dhcp?).to eq true + expect(Y2Network::BootProtocol::DHCP_AUTOIP.dhcp?).to eq true + expect(Y2Network::BootProtocol::STATIC.dhcp?).to eq false + end + end end From 7500bfe77b7f47747d2e0e46c41217011ea8e418 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 15:30:47 +0200 Subject: [PATCH 046/471] extend possible values for boot proto in cmdline --- src/include/network/lan/cmdline.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index 621feabe4..5535c312f 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -29,6 +29,7 @@ require "shellwords" require "y2network/interface_config_builder" +require "y2network/boot_protocol" module Yast module NetworkLanCmdlineInclude @@ -271,7 +272,7 @@ def infered_type(options) # @param builder [Y2Network::InterfaceConfigBuilder] # @return [Boolean] true when the options are valid; false otherwise def validate_config(builder) - unless ["none", "static", "dhcp"].include? builder["BOOTPROTO"] + if Y2Network::BootProtocol.all.none? { |bp| bp.name == builder["BOOTPROTO"] Report.Error(_("Impossible value for bootproto.")) return false end From d5e4d401e859cfb959b705ecc6cd71141d878bc7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 16:15:29 +0200 Subject: [PATCH 047/471] document interface type constants --- src/lib/y2network/interface_type.rb | 47 +++++++++++++++++---------- test/y2network/interface_type_test.rb | 7 ++++ 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index 3ef98a867..03c5decc9 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -40,7 +40,7 @@ def define_type(name, short_name) # # @return [Array] Interface types def all - @types ||= [] + @types ||= InterfaceType.constants.map { |c| InterfaceType.const_get(c) } end # Returns the interface type with a given short name @@ -87,21 +87,34 @@ def file_name name.downcase end - # Define types constants - define_type N_("Ethernet"), "eth" - define_type N_("Wireless"), "wlan" - define_type N_("Infiniband"), "ib" - define_type N_("Bonding"), "bond" - define_type N_("Bridge"), "br" - define_type N_("Dummy"), "dummy" - define_type N_("VLAN"), "vlan" - define_type N_("TUN"), "tun" - define_type N_("TAP"), "tap" - define_type N_("USB"), "usb" - # s390 - define_type N_("QETH"), "qeth" - define_type N_("LCS"), "lcs" - define_type N_("HiperSockets"), "hsi" - define_type N_("FICON"), "ficon" + # Ethernet card, integrated or attached + ETHERNET = new(N_("Ethernet"), "eth") + # Wireless card, integrated or attached + WIRELESS = new(N_("Wireless"), "wlan") + # Infiniband card + INFINIBAND = new(N_("Infiniband"), "ib") + # Bonding device + BONDING = new(N_("Bonding"), "bond") + # bridge device + BRIDGE = new(N_("Bridge"), "br") + # virtual dummy device provided by dummy kernel module + DUMMY = new(N_("Dummy"), "dummy") + # Virtual LAN + VLAN = new(N_("VLAN"), "vlan") + # TUN virtual device provided by kernel, operates on layer3 carrying IP packagets + TUN = new(N_("TUN"), "tun") + # TAP virtual device provided by kernel, operates on layer2 carrying Ethernet frames + TAP = new(N_("TAP"), "tap") + # ethernet over usb device provided by usbnet kernel module. Do not confuse + # with ethernet card attached to USB slot as it is common ETHERNET type. + USB = new(N_("USB"), "usb") + # device using qeth device driver for s390. Can operate on layer2 or layer3. + QETH = new(N_("QETH"), "qeth") + # LAN-Channel-Station (LCS) network devices. S390 specific. + LCS = new(N_("LCS"), "lcs") + # HiperSockets s390 network device + HIPERSOCKETS = new(N_("HiperSockets"), "hsi") + # FICON-attached direct access storage devices. s390 specific + FICON = new(N_("FICON"), "ficon") end end diff --git a/test/y2network/interface_type_test.rb b/test/y2network/interface_type_test.rb index e148f1976..80892defd 100644 --- a/test/y2network/interface_type_test.rb +++ b/test/y2network/interface_type_test.rb @@ -28,4 +28,11 @@ expect(type).to be(Y2Network::InterfaceType::WIRELESS) end end + + describe ".all" do + it "returns all known interface types" do + expect(described_class.all).to_not be_empty + expect(described_class.all.first).to be_a described_class + end + end end From eaf4844a76f7112e994ec1dcdec0ce79770177d8 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 16:36:43 +0200 Subject: [PATCH 048/471] rubocop and fixes problems found by test --- src/include/network/lan/cmdline.rb | 2 +- src/lib/y2network/boot_protocol.rb | 4 +++- src/lib/y2network/interface_config_builder.rb | 2 +- src/lib/y2network/interface_type.rb | 4 +++- src/lib/y2network/startmode.rb | 1 - test/y2network/boot_protocol_test.rb | 5 ++--- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index 5535c312f..2e8e879ec 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -272,7 +272,7 @@ def infered_type(options) # @param builder [Y2Network::InterfaceConfigBuilder] # @return [Boolean] true when the options are valid; false otherwise def validate_config(builder) - if Y2Network::BootProtocol.all.none? { |bp| bp.name == builder["BOOTPROTO"] + if Y2Network::BootProtocol.all.none? { |bp| bp.name == builder["BOOTPROTO"] } Report.Error(_("Impossible value for bootproto.")) return false end diff --git a/src/lib/y2network/boot_protocol.rb b/src/lib/y2network/boot_protocol.rb index f079222c3..d503ed34d 100644 --- a/src/lib/y2network/boot_protocol.rb +++ b/src/lib/y2network/boot_protocol.rb @@ -29,7 +29,9 @@ class << self # # @return [Array] def all - @all ||= BootProtocol.constants.map { |c| BootProtocol.const_get(c) } + @all ||= BootProtocol.constants + .map { |c| BootProtocol.const_get(c) } + .select { |c| c.is_a?(BootProtocol) } end # Returns the boot protocol with a given name diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 14ef955d7..78effc0cc 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -150,7 +150,7 @@ def startmode=(name) def ifplugd_priority=(value) @config["IFPLUGD_PRIORITY"] = value.to_s - if @connection_config.startmode.name == "ifplugd" + if !@connection_config.startmode || @connection_config.startmode.name != "ifplugd" @connection_config.startmode = Startmode.create("ifplugd") end @connection_config.startmode.priority = value.to_i diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index 03c5decc9..9c6e5e0c2 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -40,7 +40,9 @@ def define_type(name, short_name) # # @return [Array] Interface types def all - @types ||= InterfaceType.constants.map { |c| InterfaceType.const_get(c) } + @types ||= InterfaceType.constants + .map { |c| InterfaceType.const_get(c) } + .select { |c| c.is_a?(InterfaceType) } end # Returns the interface type with a given short name diff --git a/src/lib/y2network/startmode.rb b/src/lib/y2network/startmode.rb index bb5a68f00..fc8068f90 100644 --- a/src/lib/y2network/startmode.rb +++ b/src/lib/y2network/startmode.rb @@ -17,7 +17,6 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. - module Y2Network # Base class for startmode. It allows to create new one according to name or anlist all. # Its child have to define `to_human_string` method and possibly its own specialized attributes. diff --git a/test/y2network/boot_protocol_test.rb b/test/y2network/boot_protocol_test.rb index 0d62dcc29..5ac46cfaf 100644 --- a/test/y2network/boot_protocol_test.rb +++ b/test/y2network/boot_protocol_test.rb @@ -42,11 +42,10 @@ end describe "#dhcp?" do - it "returns true if protocol at least partially is read from dhcp" do + it "returns true if protocol at least partially is read from dhcp" do expect(Y2Network::BootProtocol::DHCP4.dhcp?).to eq true expect(Y2Network::BootProtocol::DHCP_AUTOIP.dhcp?).to eq true expect(Y2Network::BootProtocol::STATIC.dhcp?).to eq false - end + end end end - From c07a753fcd5246e623b2c5fa8c7beb05346208f4 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 19 Jul 2019 16:50:10 +0200 Subject: [PATCH 049/471] fix doc --- src/lib/y2network/boot_protocol.rb | 2 -- src/lib/y2network/interface_type.rb | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/src/lib/y2network/boot_protocol.rb b/src/lib/y2network/boot_protocol.rb index d503ed34d..18494063a 100644 --- a/src/lib/y2network/boot_protocol.rb +++ b/src/lib/y2network/boot_protocol.rb @@ -21,8 +21,6 @@ module Y2Network # This class represents the boot protocols which are supported (not all by all backends). - # - # Constants may be defined using the {define_protocol} method. class BootProtocol class << self # Returns all the existing protocols diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index 9c6e5e0c2..36192f865 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -21,21 +21,11 @@ module Y2Network # This class represents the interface types which are supported. - # - # Constants may be defined using the {define_type} method. class InterfaceType extend Yast::I18n include Yast::I18n class << self - # @param name [String] Type name ("Ethernet", "Wireless", etc.) - # @param short_name [String] Short name used in legacy code - def define_type(name, short_name) - const_name = name.upcase - const_set(const_name, new(name, short_name)) - all << const_get(const_name) - end - # Returns all the existing types # # @return [Array] Interface types From 8ad27bbf4fc99613e42f0da3016fb013d5940fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 11:57:28 +0100 Subject: [PATCH 050/471] Initialize InterfaceFile collections to empy hashes --- src/lib/y2network/sysconfig/interface_file.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 0c3829627..4000cf0bd 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -230,7 +230,9 @@ def variable_name(param_name) # @param interface [String] Interface interface def initialize(interface) @interface = interface - @values = {} + @values = collection_variables.each_with_object({}) do |variable, hash| + hash[variable.name] = {} + end end SYSCONFIG_NETWORK_PATH = Pathname.new("/etc").join("sysconfig", "network").freeze @@ -375,7 +377,7 @@ def value_as_ipaddr(value) def write_collection(key, values) clean_collection(key) values.each do |suffix, value| - write_key = suffix == :default ? key : "#{key}_#{suffix}" + write_key = suffix == :default ? key : "#{key}#{suffix}" write_scalar(write_key, value) end end @@ -399,6 +401,13 @@ def write_scalar(key, value) path = Yast::Path.new(".network.value.\"#{interface}\".#{key}") Yast::SCR.Write(path, raw_value) end + + # Returns the variables which are collections + # + # @return [Array] List of collection variables + def collection_variables + self.class.variables.values.select(&:collection?) + end end end end From a1b672385ef3dfc92dc5c43d0b266a10f9693b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 11:59:13 +0100 Subject: [PATCH 051/471] Make IPConfig 'id' property accessible --- src/lib/y2network/connection_config/ip_config.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index 0a130f145..c1a4e5bb9 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -29,6 +29,8 @@ class IPConfig attr_accessor :remote_address # @return [IPAddress,nil] Broadcast address attr_accessor :broadcast + # @return [Symbol,String] ID (needed for sysconfig backend in order to write suffixes in + attr_accessor :id # Constructor # From ea291326962b0d6fb5367843b5d15cd989b5ee63 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 22 Jul 2019 13:29:34 +0200 Subject: [PATCH 052/471] make rubocop happy --- .../sysconfig/connection_config_readers/wireless_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/y2network/sysconfig/connection_config_readers/wireless_test.rb b/test/y2network/sysconfig/connection_config_readers/wireless_test.rb index 22ec659bb..7d51d8bc5 100644 --- a/test/y2network/sysconfig/connection_config_readers/wireless_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/wireless_test.rb @@ -47,7 +47,7 @@ interface: "wlan0", name: "Wireless Card 0", bootproto: "static", - startmode: "auto", + startmode: "auto", ip_address: address, wireless_auth_mode: "eap", wireless_eap_mode: "PEAP", @@ -160,7 +160,7 @@ wireless_auth_mode: :open, wireless_mode: :managed, bootproto: "static", - startmode: "auto", + startmode: "auto" ).as_null_object end From e42ad5125a61b613eac13adc95223a100cc2107e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 22 Jul 2019 13:33:41 +0200 Subject: [PATCH 053/471] fix documentation issues and increase level --- Rakefile | 2 +- src/lib/y2network/interface_config_builder.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index f7c02bac4..f901faccb 100644 --- a/Rakefile +++ b/Rakefile @@ -4,5 +4,5 @@ Yast::Tasks.configuration do |conf| # lets ignore license check for now conf.skip_license_check << /.*/ # ensure we are not getting worse with documentation - conf.documentation_minimal = 61 if conf.respond_to?(:documentation_minimal=) + conf.documentation_minimal = 62 if conf.respond_to?(:documentation_minimal=) end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 9ec5d4d1e..4ac613651 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -157,7 +157,7 @@ def startmode startmode end - # @param [String] startmode name used to create Startmode object + # @param [String] name startmode name used to create Startmode object def startmode=(name) mode = Startmode.create(name) # assign only if it is not already this value. This helps with ordering of ifplugd_priority @@ -165,7 +165,7 @@ def startmode=(name) @config["STARTMODE"] = mode.name end - # @param [Integer] priority value + # @param [Integer] value priority value def ifplugd_priority=(value) @config["IFPLUGD_PRIORITY"] = value.to_s if !@connection_config.startmode || @connection_config.startmode.name != "ifplugd" From 2dc4be0ae71591f104362e708d70eeeae10ee7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 12:00:14 +0100 Subject: [PATCH 054/471] Add support for multiple IPs writing in Ethernet connections --- .../connection_config_writers/base.rb | 52 ++++++++++++++++ .../connection_config_writers/ethernet.rb | 13 ++-- .../ethernet_test.rb | 60 +++++++++++++++---- 3 files changed, 104 insertions(+), 21 deletions(-) create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/base.rb diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb new file mode 100644 index 000000000..7e358befb --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -0,0 +1,52 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/ip_config" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + class Base + # @return [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file + attr_reader :file + + # Constructor + # + # @param file [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file + def initialize(file) + @file = file + end + + private + + # Write IP configuration + # + # @param ip_configs [Array] IPs configuration + def write_ip_configs(ip_configs) + ip_configs.each do |ip_config| + file.ipaddrs[ip_config.id] = ip_config.address + file.labels[ip_config.id] = ip_config.label + file.remote_ipaddrs[ip_config.id] = ip_config.remote_address + file.broadcasts.merge!(ip_config.id => ip_config.broadcast) + end + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb b/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb index 593f828ec..1138facc8 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb @@ -17,27 +17,22 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "y2network/sysconfig/connection_config_writers/base" + module Y2Network module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Ethernet # object to the underlying system. - class Ethernet - # @return [Y2Network::Sysconfig::InterfaceFile] - attr_reader :file - - def initialize(file) - @file = file - end - + class Ethernet < Base # Writes connection information to the interface configuration file # # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write def write(conn) file.bootproto = conn.bootproto - file.ipaddr = conn.ip_address file.name = conn.description file.startmode = conn.startmode + write_ip_configs(conn.ip_configs) end end end diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index 7118be48f..4786071aa 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -22,9 +22,37 @@ require "y2network/sysconfig/connection_config_writers/ethernet" require "y2network/sysconfig/interface_file" require "y2network/connection_config/ethernet" +require "y2network/connection_config/ip_config" describe Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet do - subject(:writer) { described_class.new(file) } + subject(:handler) { described_class.new(file) } + + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } + + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end + + let(:ip_configs) do + [ + Y2Network::ConnectionConfig::IPConfig.new( + address: "192.168.122.1/24", id: :default, + broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + ), + Y2Network::ConnectionConfig::IPConfig.new(address: Y2Network::IPAddress.from_string("10.0.0.1/8"), + id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2")) + ] + end let(:conn) do instance_double( @@ -32,23 +60,31 @@ interface: "eth0", description: "Ethernet Card 0", bootproto: :static, - ip_address: IPAddr.new("192.168.122.1"), + ip_configs: ip_configs, startmode: :auto ) end - let(:file) { instance_double(Y2Network::Sysconfig::InterfaceFile) } - before do - allow(Y2Network::Sysconfig::InterfaceFile).to receive(:new).and_return(file) - end + let(:file) { Y2Network::Sysconfig::InterfaceFile.find(conn.interface) } describe "#write" do - it "updates ethernet related properties" do - expect(file).to receive(:name=).with(conn.description) - expect(file).to receive(:bootproto=).with(conn.bootproto) - expect(file).to receive(:ipaddr=).with(conn.ip_address) - expect(file).to receive(:startmode=).with(conn.startmode) - writer.write(conn) + it "updates common properties" do + handler.write(conn) + expect(file).to have_attributes( + name: conn.description, + bootproto: :static, + startmode: :auto + ) + end + + it "sets IP configuration attributes" do + handler.write(conn) + expect(file).to have_attributes( + ipaddrs: { default: ip_configs[0].address, "_0" => ip_configs[1].address }, + broadcasts: { default: ip_configs[0].broadcast, "_0" => nil }, + remote_ipaddrs: { default: nil, "_0" => ip_configs[1].remote_address }, + labels: { default: nil, "_0" => "my-label" } + ) end end end From 2557f507afb73bc1554b3859526fbc6e4c823b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 12:45:45 +0100 Subject: [PATCH 055/471] Add support for multiple IPs writing in Wireless connections --- .../connection_config_writers/wireless.rb | 14 ++++------ .../wireless_test.rb | 28 +++++++++++++++++-- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb index b670db491..399bd041e 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb @@ -16,25 +16,20 @@ # # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + module Y2Network module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Wireless # object to the underlying system. - class Wireless - # @return [Y2Network::Sysconfig::InterfaceFile] - attr_reader :file - - def initialize(file) - @file = file - end - + class Wireless < Base # Writes connection information to the interface configuration file # # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write def write(conn) file.bootproto = conn.bootproto - file.ipaddr = conn.ip_address file.name = conn.description file.startmode = conn.startmode file.wireless_ap = conn.ap @@ -43,6 +38,7 @@ def write(conn) file.wireless_mode = conn.mode file.wireless_nwid = conn.nwid write_auth_settings(conn) if conn.auth_mode + write_ip_configs(conn.ip_configs) file end diff --git a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb index 81cd9266d..f28171ff4 100644 --- a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb @@ -26,11 +26,14 @@ subject(:handler) { described_class.new(file) } let(:file) { Y2Network::Sysconfig::InterfaceFile.new("wlan0") } + let(:conn) do Y2Network::ConnectionConfig::Wireless.new.tap do |conn| + conn.interface = "wlan0" + conn.description = "Wireless Card 0" conn.startmode = :auto conn.bootproto = :static - conn.ip_address = address + conn.ip_configs = ip_configs conn.mode = "managed" conn.essid = "example_essid" conn.auth_mode = :open @@ -38,14 +41,23 @@ conn.ap_scanmode = "1" end end - let(:address) { IPAddr.new("192.168.122.100") } + + let(:ip_configs) do + [ + Y2Network::ConnectionConfig::IPConfig.new( + address: "192.168.122.1/24", id: :default, + broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + ), + Y2Network::ConnectionConfig::IPConfig.new(address: Y2Network::IPAddress.from_string("10.0.0.1/8"), + id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2")) + ] + end it "sets relevant attributes" do handler.write(conn) expect(file).to have_attributes( startmode: :auto, bootproto: :static, - ipaddr: address, wireless_mode: conn.mode, wireless_essid: conn.essid, wireless_auth_mode: :open, @@ -54,6 +66,16 @@ ) end + it "sets IP configuration attributes" do + handler.write(conn) + expect(file).to have_attributes( + ipaddrs: { default: ip_configs[0].address, "_0" => ip_configs[1].address }, + broadcasts: { default: ip_configs[0].broadcast, "_0" => nil }, + remote_ipaddrs: { default: nil, "_0" => ip_configs[1].remote_address }, + labels: { default: nil, "_0" => "my-label" } + ) + end + context "WPA-EAP network configuration" do let(:conn) do Y2Network::ConnectionConfig::Wireless.new.tap do |conn| From 174e0ae01a808087c109e751293d31b317584398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 12:45:58 +0100 Subject: [PATCH 056/471] Initialize ConnectionConfig::Base#ip_configs to an empty array --- src/lib/y2network/connection_config/base.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 0a3cbc572..3e2abcae3 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -49,6 +49,11 @@ class Base # @return [String] Connection's description (e.g., "Ethernet Card 0") attr_accessor :description + # Constructor + def initialize + @ip_configs = [] + end + # Returns the connection type # # Any subclass could define this method is the default From b53daa218345b943023a481c06322db26c5e9154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 12:53:16 +0100 Subject: [PATCH 057/471] Make RuboCop happy --- .../sysconfig/connection_config_readers/base.rb | 10 +++++----- .../sysconfig/connection_config_readers/wireless.rb | 2 +- test/y2network/sysconfig/interface_file_test.rb | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 4d55bd42c..61b28d694 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -43,12 +43,12 @@ def ip_configs prefix = file.prefixlens[id] ip.prefix = prefix if prefix Y2Network::ConnectionConfig::IPConfig.new( - id: id, - address: ip, - scope: file.scopes[id], - label: file.labels[id], + id: id, + address: ip, + scope: file.scopes[id], + label: file.labels[id], remote_address: file.remote_ipaddrs[id], - broadcast: file.broadcasts[id] + broadcast: file.broadcasts[id] ) end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index e0540698d..8077b3bb9 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -51,7 +51,7 @@ def connection_config end end - private + private # Max number of wireless keys MAX_WIRELESS_KEYS = 4 diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 8695441d4..c863223ed 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -22,7 +22,7 @@ require "tmpdir" describe Y2Network::Sysconfig::InterfaceFile do - subject(:file) { described_class.new(interface_name).tap { |f| f.load } } + subject(:file) { described_class.new(interface_name).tap(&:load) } let(:interface_name) { "eth0" } @@ -69,7 +69,7 @@ def file_content(scr_root, file) it "returns a hash with IP addresses indexed by their suffixes" do expect(file.ipaddrs).to eq( "_0" => Y2Network::IPAddress.from_string("192.168.123.1/24"), - "_1" => Y2Network::IPAddress.from_string("10.0.0.1"), + "_1" => Y2Network::IPAddress.from_string("10.0.0.1") ) end end @@ -87,7 +87,7 @@ def file_content(scr_root, file) let(:interface_name) { "eth2" } it "sets the bootproto" do - addresses = { default: Y2Network::IPAddress.from_string("10.0.0.1")} + addresses = { default: Y2Network::IPAddress.from_string("10.0.0.1") } expect { file.ipaddrs = addresses } .to change { file.ipaddrs }.from({}).to(addresses) end From 490cb4f724c9b4e1336f9ff9158d88e1faef7017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 13:15:35 +0100 Subject: [PATCH 058/471] Fix InterfaceFile tests --- test/y2network/sysconfig/interface_file_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index c863223ed..f58bb6c8d 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -130,7 +130,7 @@ def file_content(scr_root, file) end describe "#wireless_keys=" do - let(:keys) { { default: "123456", "1" => "abcdef" } } + let(:keys) { { default: "123456", "_1" => "abcdef" } } it "sets the wireless keys" do expect { file.wireless_keys = keys }.to change { file.wireless_keys }.to(keys) @@ -152,7 +152,7 @@ def file_content(scr_root, file) describe "when multiple wireless keys are specified" do it "writes indexes keys" do - file.wireless_keys = { :default => "123456", "1" => "abcdef" } + file.wireless_keys = { :default => "123456", "_1" => "abcdef" } file.save content = file_content(scr_root, file) From 95daa658ad5a0dbb9cd00a6d9f79154fcf989ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 13:22:47 +0100 Subject: [PATCH 059/471] IPConfig address is not a named argument anymore --- src/lib/y2network/connection_config/ip_config.rb | 2 +- .../sysconfig/connection_config_readers/base.rb | 2 +- .../connection_config_writers/ethernet_test.rb | 10 ++++++---- .../connection_config_writers/wireless_test.rb | 10 ++++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index c1a4e5bb9..e93a176f4 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -41,7 +41,7 @@ class IPConfig # @param label [String,nil] # @param remote_address [IPaddress,nil] # @param broadcast [IPaddress,nil] - def initialize(address:, id: nil, scope: nil, label: nil, remote_address: nil, broadcast: nil) + def initialize(address, id: nil, scope: nil, label: nil, remote_address: nil, broadcast: nil) @address = address @id = id || :default @scope = scope || :global diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 61b28d694..5d7d3e653 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -43,8 +43,8 @@ def ip_configs prefix = file.prefixlens[id] ip.prefix = prefix if prefix Y2Network::ConnectionConfig::IPConfig.new( + ip, id: id, - address: ip, scope: file.scopes[id], label: file.labels[id], remote_address: file.remote_ipaddrs[id], diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index 4786071aa..02c8e0181 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -46,11 +46,13 @@ def file_content(scr_root, file) let(:ip_configs) do [ Y2Network::ConnectionConfig::IPConfig.new( - address: "192.168.122.1/24", id: :default, - broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + Y2Network::IPAddress.from_string("192.168.122.1/24"), id: :default, + broadcast: Y2Network::IPAddress.from_string("192.168.122.255") ), - Y2Network::ConnectionConfig::IPConfig.new(address: Y2Network::IPAddress.from_string("10.0.0.1/8"), - id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2")) + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.1/8"), id: "_0", + label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") + ) ] end diff --git a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb index f28171ff4..6cbd9f711 100644 --- a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb @@ -45,11 +45,13 @@ let(:ip_configs) do [ Y2Network::ConnectionConfig::IPConfig.new( - address: "192.168.122.1/24", id: :default, - broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + Y2Network::IPAddress.from_string("192.168.122.1/24"), id: :default, + broadcast: Y2Network::IPAddress.from_string("192.168.122.255") ), - Y2Network::ConnectionConfig::IPConfig.new(address: Y2Network::IPAddress.from_string("10.0.0.1/8"), - id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2")) + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.1/8"), id: "_0", + label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") + ) ] end From 60de3e6f19f7112523590c01125e83bf90dead1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 13:25:28 +0100 Subject: [PATCH 060/471] Updates from code review --- src/lib/y2network/sysconfig/interface_file.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 4000cf0bd..4161d19c7 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -112,6 +112,8 @@ def variables @variables ||= {} end + private + # Parameter name to internal variable name # # @param param_name [Symbol] From 8bc9e1be1c58f9e3d329c84ccbcdcb765cf43929 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 22 Jul 2019 15:17:18 +0200 Subject: [PATCH 061/471] add helpers to type and fix its usage --- src/include/network/lan/address.rb | 2 +- src/include/network/lan/cmdline.rb | 2 +- src/include/network/lan/complex.rb | 2 +- src/include/network/lan/hardware.rb | 14 ++++++------- src/lib/y2network/dialogs/add_interface.rb | 2 +- src/lib/y2network/dialogs/edit_interface.rb | 2 +- src/lib/y2network/interface_config_builder.rb | 2 +- src/lib/y2network/interface_type.rb | 21 +++++++++++++++++++ src/lib/y2network/widgets/address_tab.rb | 8 +++---- src/lib/y2network/widgets/boot_protocol.rb | 2 +- src/lib/y2network/widgets/general_tab.rb | 4 ++-- src/lib/y2network/widgets/hardware_tab.rb | 2 +- src/modules/LanItems.rb | 4 ++-- test/y2network/interface_type_test.rb | 14 +++++++++++++ 14 files changed, 58 insertions(+), 23 deletions(-) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index f75472a0a..9c415175f 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -106,7 +106,7 @@ def AddressDialog(builder:) # rollback if changes are canceled, as still some widgets edit LanItems directly LanItems.Rollback if ret != :next # proceed with WLAN settings if appropriate, #42420 - ret = :wire if ret == :next && builder.type == "wlan" + ret = :wire if ret == :next && builder.type.wireless? log.info "AddressDialog res: #{ret.inspect}" ret diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index 2e8e879ec..f49549023 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -298,7 +298,7 @@ def validate_config(builder) # @param builder [Y2Network::InterfaceConfigBuilder] # @param options [Hash{String => String}] action options def update_builder_from_options!(builder, options) - case builder.type + case builder.type.short_name when "bond" builder["BOND_SLAVES"] = options.fetch("slaves", "").split(" ") when "vlan" diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index 0f1fc2acd..5585235f4 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -330,7 +330,7 @@ def UpdateSlaves # in related sysconfig scripts or makes no sence for slaves (e.g. ip configuration). builder["NETMASK"] = "" builder["BOOTPROTO"] = "none" - case master_builder.type + case master_builder.type.short_name when "bond" LanItems.startmode = "hotplug" # If there is already a rule based on the bus_id, do not update it. diff --git a/src/include/network/lan/hardware.rb b/src/include/network/lan/hardware.rb index f9d41be4c..f8d18ba6e 100644 --- a/src/include/network/lan/hardware.rb +++ b/src/include/network/lan/hardware.rb @@ -76,12 +76,12 @@ def S390Dialog(builder:) # S/390 dialog caption caption = _("S/390 Network Card Configuration") - drvtype = DriverType(builder.type) + drvtype = DriverType(builder.type.short_name) helptext = "" contents = Empty() - if Builtins.contains(["qeth", "hsi"], builder.type) + if Builtins.contains(["qeth", "hsi"], builder.type.short_name) # CHANIDS tmp_list = Builtins.splitstring(LanItems.qeth_chanids, " ") chanids_map = { @@ -351,7 +351,7 @@ def S390Dialog(builder:) ) end - id = case builder.type + id = case builder.type.short_name when "hsi" then :qeth_options when "qeth" then :qeth_portname when "iucv" then :iucv_user @@ -376,7 +376,7 @@ def S390Dialog(builder:) when :back break when :next - if builder.type == "iucv" + if builder.type.short_name == "iucv" LanItems.device = Ops.add( "id-", Convert.to_string(UI.QueryWidget(Id(:iucv_user), :Value)) @@ -386,12 +386,12 @@ def S390Dialog(builder:) ) end - if builder.type == "ctc" + if builder.type.short_name == "ctc" LanItems.chan_mode = Convert.to_string( UI.QueryWidget(Id(:chan_mode), :Value) ) end - if builder.type == "lcs" + if builder.type.short_name == "lcs" LanItems.lcs_timeout = Convert.to_string( UI.QueryWidget(Id(:lcs_timeout), :Value) ) @@ -399,7 +399,7 @@ def S390Dialog(builder:) UI.QueryWidget(Id(:chan_mode), :Value) ) end - if builder.type == "qeth" || builder.type == "hsi" + if builder.type.short_name == "qeth" || builder.type.short_name == "hsi" LanItems.qeth_options = Convert.to_string( UI.QueryWidget(Id(:qeth_options), :Value) ) diff --git a/src/lib/y2network/dialogs/add_interface.rb b/src/lib/y2network/dialogs/add_interface.rb index cc28b080d..277449531 100644 --- a/src/lib/y2network/dialogs/add_interface.rb +++ b/src/lib/y2network/dialogs/add_interface.rb @@ -11,7 +11,7 @@ module Dialogs # Dialog which starts new device creation class AddInterface < CWM::Dialog def initialize(default: nil) - @type_widget = Widgets::InterfaceType.new(default: default) + @type_widget = Widgets::InterfaceType.new(default: default ? default.short_name : nil) end def contents diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index a8fd72c7f..59da2d74b 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -31,7 +31,7 @@ def contents addr_tab = Widgets::AddressTab.new(@settings) addr_tab.initial = true - tabs = case @settings.type + tabs = case @settings.type.short_name when "vlan" [Widgets::GeneralTab.new(@settings), addr_tab] when "tun", "tap" diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 4ac613651..dd5e9450f 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -49,7 +49,7 @@ def self.for(type) # @return [String] Device name (eth0, wlan0, etc.) attr_accessor :name - # @return [String] type of @see Y2Network::Interface which is intended to be build (e.g. "eth") + # @return [Y2Network::InterfaceType] type of @see Y2Network::Interface which is intended to be build attr_accessor :type # Constructor diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index 36192f865..920cfc3c7 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -79,6 +79,27 @@ def file_name name.downcase end + def respond_to_missing?(method_name, _include_private = false) + return false unless method_name.to_s.end_with?("?") + + target_name = method_name.to_s[0..-2] + InterfaceType.all.any? do |type| + type.name.downcase == target_name || + type.short_name == target_name + end + end + + def method_missing(method_name, *arguments, &block) + return super unless respond_to_missing?(method_name) + + if !arguments.empty? + raise ArgumentError, "no params are accepted for method #{method_name}" + end + + target_name = method_name.to_s[0..-2] + [name.downcase, short_name].include?(target_name) + end + # Ethernet card, integrated or attached ETHERNET = new(N_("Ethernet"), "eth") # Wireless card, integrated or attached diff --git a/src/lib/y2network/widgets/address_tab.rb b/src/lib/y2network/widgets/address_tab.rb index be64a3577..9c643bd2f 100644 --- a/src/lib/y2network/widgets/address_tab.rb +++ b/src/lib/y2network/widgets/address_tab.rb @@ -27,13 +27,13 @@ def label def contents type = @settings.type - drvtype = driver_type(type) + drvtype = driver_type(type.short_name) # TODO: check if this kind of device is still valid and used is_ptp = drvtype == "ctc" || drvtype == "iucv" # TODO: dynamic for dummy. or add dummy from outside? no_dhcp = is_ptp || - type == "dummy" + type.dummy? address_p2p_contents = Frame( "", # labelless frame @@ -61,10 +61,10 @@ def contents end label = HBox( - type == "vlan" ? VBox(HBox(VlanInterface.new(@settings), VlanID.new(@settings))) : Empty() + type.vlan? ? VBox(HBox(VlanInterface.new(@settings), VlanID.new(@settings))) : Empty() ) - address_contents = if ["tun", "tap"].include?(type) + address_contents = if type.tun? || type.tap? # TODO: move it to own tab or general as it does not fit here VBox(Left(label), Tunnel.new(@settings)) else diff --git a/src/lib/y2network/widgets/boot_protocol.rb b/src/lib/y2network/widgets/boot_protocol.rb index f7a948eab..f9386b079 100644 --- a/src/lib/y2network/widgets/boot_protocol.rb +++ b/src/lib/y2network/widgets/boot_protocol.rb @@ -89,7 +89,7 @@ def contents def ibft_available? # IBFT only for eth, is it correct? - @settings.type == Y2Network::InterfaceType::ETHERNET + @settings.type.ethernet? end def init diff --git a/src/lib/y2network/widgets/general_tab.rb b/src/lib/y2network/widgets/general_tab.rb index c9c4670cc..5ef233903 100644 --- a/src/lib/y2network/widgets/general_tab.rb +++ b/src/lib/y2network/widgets/general_tab.rb @@ -42,8 +42,8 @@ def contents VSpacing(0.4), Frame(_("Firewall Zone"), HBox(FirewallZone.new(@settings), HStretch())), VSpacing(0.4), - type == "ib" ? HBox(IPoIBMode.new(@settings)) : Empty(), - type == "ib" ? VSpacing(0.4) : Empty(), + type.infiniband? ? HBox(IPoIBMode.new(@settings)) : Empty(), + type.infiniband? ? VSpacing(0.4) : Empty(), Frame( _("Maximum Transfer Unit (MTU)"), HBox(MTU.new(@settings), HStretch()) diff --git a/src/lib/y2network/widgets/hardware_tab.rb b/src/lib/y2network/widgets/hardware_tab.rb index 773854d5f..6d287863d 100644 --- a/src/lib/y2network/widgets/hardware_tab.rb +++ b/src/lib/y2network/widgets/hardware_tab.rb @@ -47,7 +47,7 @@ def contents end def eth? - @settings.type == "eth" + @settings.type.ethernet? end end end diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index a7e173339..19c8b9d34 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1747,7 +1747,7 @@ def Commit(builder) newdev = setup_dhclient_options(newdev) # FIXME: network-ng currently works for eth only - case builder.type + case builder.type.short_name when "bond" # we need current slaves - when some of them is not used anymore we need to # configure it for deletion from ifcfg (SCR expects special value nil) @@ -1835,7 +1835,7 @@ def Commit(builder) newdev["WIRELESS_POWER"] = @wl_power ? "yes" : "no" end - if DriverType(builder.type) == "ctc" + if DriverType(builder.type.short_name) == "ctc" if Ops.get(NetworkConfig.Config, "WAIT_FOR_INTERFACES").nil? || Ops.less_than( Ops.get_integer(NetworkConfig.Config, "WAIT_FOR_INTERFACES", 0), diff --git a/test/y2network/interface_type_test.rb b/test/y2network/interface_type_test.rb index 80892defd..af449a48a 100644 --- a/test/y2network/interface_type_test.rb +++ b/test/y2network/interface_type_test.rb @@ -35,4 +35,18 @@ expect(described_class.all.first).to be_a described_class end end + + describe "#?" do + it "returns true if name is same as in method name" do + expect(ethernet.ethernet?).to eq true + expect(ethernet.wireless?).to eq false + end + end + + describe "#?" do + it "returns true if short_name is same as in method name" do + expect(ethernet.eth?).to eq true + expect(ethernet.wlan?).to eq false + end + end end From f33e6ac96521c4309b7b15957ddafd6afe9e5173 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 22 Jul 2019 15:58:37 +0200 Subject: [PATCH 062/471] Add doc for new helpers --- src/lib/y2network/interface_type.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index 920cfc3c7..c1a0a0756 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -21,6 +21,11 @@ module Y2Network # This class represents the interface types which are supported. + # Class have helpers to check if given type is what needed. It check name and also short name: + # @example check for ethernet cards + # type.ethernet? + # @example check for wifi + # type.wlan? class InterfaceType extend Yast::I18n include Yast::I18n From 5d63b0c5e9f658b0ec4f6f97834432dfc64c19f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 15:50:40 +0100 Subject: [PATCH 063/471] Drop IPConfig#scope which is not handled by us --- src/lib/y2network/connection_config/ip_config.rb | 6 +----- .../y2network/sysconfig/connection_config_readers/base.rb | 1 - src/lib/y2network/sysconfig/interface_file.rb | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index e93a176f4..36de2e223 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -21,8 +21,6 @@ module ConnectionConfig class IPConfig # @return [IPAddress] IP address attr_accessor :address - # @return [Symbol] Address scope (:global, :site, :link or :host) - attr_accessor :scope # @return [String,nil] Address label attr_accessor :label # @return [IPAddress,nil] Remote IP address of a point to point connection @@ -37,14 +35,12 @@ class IPConfig # @param address [IPAddress] # @param id [Symbol,String] ID (needed for sysconfig backend in order to write suffixes in # ifcfg-* files) - # @param scope [Symbol] # @param label [String,nil] # @param remote_address [IPaddress,nil] # @param broadcast [IPaddress,nil] - def initialize(address, id: nil, scope: nil, label: nil, remote_address: nil, broadcast: nil) + def initialize(address, id: nil, label: nil, remote_address: nil, broadcast: nil) @address = address @id = id || :default - @scope = scope || :global @label = label @remote_address = remote_address @broadcast = broadcast diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 5d7d3e653..4a3955b17 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -45,7 +45,6 @@ def ip_configs Y2Network::ConnectionConfig::IPConfig.new( ip, id: id, - scope: file.scopes[id], label: file.labels[id], remote_address: file.remote_ipaddrs[id], broadcast: file.broadcasts[id] diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 4161d19c7..62286e6f5 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -143,10 +143,6 @@ def variable_name(param_name) # @return [Symbol] When the interface should be set up (:manual, :auto, :hotplug, :nfsroot, :off) define_variable(:startmode, :symbol) - # !@attribute [r] scopes - # @return [Hash] Scopes of the area where addresses are valid (:global, :site, :link, :host) - define_collection_parameter(:scope, :symbol) - # !@attribute [r] labels # @return [Hash] Label to assign to the address define_collection_parameter(:label, :symbol) From ced88cd711d0886f2fa867274cacb2810c7c3fb2 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 22 Jul 2019 17:58:15 +0200 Subject: [PATCH 064/471] use slaves helper --- src/include/network/lan/cmdline.rb | 2 +- src/lib/y2network/interface_config_builder.rb | 2 +- .../y2network/interface_config_builders/bonding.rb | 12 ++++++++++-- src/lib/y2network/widgets/bond_slave.rb | 4 ++-- test/y2network/interface_config_builder_test.rb | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index f49549023..6741fafd0 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -300,7 +300,7 @@ def validate_config(builder) def update_builder_from_options!(builder, options) case builder.type.short_name when "bond" - builder["BOND_SLAVES"] = options.fetch("slaves", "").split(" ") + builder.slaves = options.fetch("slaves", "").split(" ") when "vlan" builder["ETHERDEVICE"] = options.fetch("ethdevice", "") when "br" diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index dd5e9450f..b90d28657 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -342,7 +342,7 @@ def replace_ifplugd? return true if !Yast::Arch.is_laptop return true if Yast::NetworkService.is_network_manager # virtual devices cannot expect any event from ifplugd - return true if ["bond", "vlan", "br"].include? type + return true if ["bond", "vlan", "br"].include? type.short_name false end diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index af8622025..afd4533fe 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -11,7 +11,7 @@ def initialize super(type: InterfaceType::BONDING) # fill mandatory bond option - @config["BOND_SLAVES"] = [] + @slaves = [] end # @return [Array] list of interfaces usable for the bond device @@ -32,11 +32,19 @@ def bond_options @bond_options end + def slaves + @slaves + end + + def slaves=(value) + @slaves = value + end + # (see Y2Network::InterfaceConfigBuilder#save) def save super - Yast::LanItems.bond_slaves = @config["BOND_SLAVES"] + Yast::LanItems.bond_slaves = @slaves Yast::LanItems.bond_option = bond_options end diff --git a/src/lib/y2network/widgets/bond_slave.rb b/src/lib/y2network/widgets/bond_slave.rb index 0f720cf78..558a2d845 100644 --- a/src/lib/y2network/widgets/bond_slave.rb +++ b/src/lib/y2network/widgets/bond_slave.rb @@ -68,7 +68,7 @@ def help # Default function to init the value of slave devices box for bonding. def init - slaves = @settings["BOND_SLAVES"] || [] + slaves = @settings.slaves # TODO: use def items, but problem now is that slave_items returns term and not array items = slave_items_from( @settings.bondable_interfaces.map(&:name), @@ -95,7 +95,7 @@ def init # Default function to store the value of slave devices box. def store - @settings["BOND_SLAVES"] = selected_items + @settings.slaves = selected_items end # Validates created bonding. Currently just prevent the user to create a diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index fe537ad1c..f20fc6021 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -124,7 +124,7 @@ # check for virtual device type is done via Builtins.contains. I don't # want to stub it because it requires default stub value definition for # other calls of the function. It might have unexpected inpacts. - allow(config_builder).to receive(:type) { "bond" } + allow(config_builder).to receive(:type).and_return(Y2Network::InterfaceType::BONDING) result = config_builder.device_sysconfig["STARTMODE"] expect(result).to be_eql expected_startmode From cfc4e9803dde26a40d6a6da85005290a13327bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 22 Jul 2019 17:21:35 +0100 Subject: [PATCH 065/471] Rename define_collection_{parameter,variable} for consistency --- src/lib/y2network/sysconfig/interface_file.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 61d54d7ee..6e94b2e42 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -90,7 +90,7 @@ def define_variable(param_name, type = :string) # # @param param_name [Symbol] Parameter name # @param type [Symbol] Array elements type (:string, :integer, :symbol, :ipaddr) - def define_collection_parameter(param_name, type = :string) + def define_collection_variable(param_name, type = :string) name = variable_name(param_name) variables[name] = Variable.new(name, type, true) @@ -105,7 +105,7 @@ def define_collection_parameter(param_name, type = :string) # Known configuration variables # - # A variable is defined by using {define_variable} or {define_collection_parameter} methods. + # A variable is defined by using {define_variable} or {define_collection_variable} methods. # # @return [Array] def variables @@ -128,7 +128,7 @@ def variable_name(param_name) # !@attribute [r] ipaddr # @return [Y2Network::IPAddress] IP address - define_collection_parameter(:ipaddr, :ipaddr) + define_collection_variable(:ipaddr, :ipaddr) # !@attribute [r] name # @return [String] Interface's description (e.g., "Ethernet Card 0") @@ -147,11 +147,11 @@ def variable_name(param_name) # !@attribute [r] labels # @return [Hash] Label to assign to the address - define_collection_parameter(:label, :symbol) + define_collection_variable(:label, :symbol) # !@attribute [r] remote_ipaddrs # @return [Hash] Remote IP address of a point to point connection - define_collection_parameter(:remote_ipaddr, :ipaddr) + define_collection_variable(:remote_ipaddr, :ipaddr) # !@attribute [r] ifplugd_priority # return [Integer] when startmode is set to ifplugd this defines its priority. Not handled @@ -160,22 +160,22 @@ def variable_name(param_name) # !@attribute [r] broadcasts # @return [Hash] Broadcasts addresses - define_collection_parameter(:broadcast, :ipaddr) + define_collection_variable(:broadcast, :ipaddr) # !@attribute [r] prefixlens # @return [Hash] Prefixes lengths - define_collection_parameter(:prefixlen, :ipaddr) + define_collection_variable(:prefixlen, :ipaddr) # !@attribute [r] netmasks # @return [Hash] Netmasks - define_collection_parameter(:netmask, :ipaddr) + define_collection_variable(:netmask, :ipaddr) # !@attribute [r] wireless_key_length # @return [Integer] Length in bits for all keys used define_variable(:wireless_key_length, :integer) # !@attribute [r] wireless_keys # @return [Array] List of wireless keys - define_collection_parameter(:wireless_key, :string) + define_collection_variable(:wireless_key, :string) # !@attribute [r] wireless_default_key # @return [Integer] Index of the default key From 4b4d424cce36d4fbca732207662ce49740031e34 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 09:12:35 +0200 Subject: [PATCH 066/471] add bridge ports helper --- src/lib/y2network/interface_config_builders/bridge.rb | 10 ++++++++++ src/lib/y2network/widgets/bridge_ports.rb | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index fd73ba5f0..d35b44ecd 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -26,6 +26,16 @@ def bridgeable_interfaces interfaces.all.select { |i| bridgeable?(i) } end + # @return [Array] + def ports + @config["BRIDGE_PORTS"].split + end + + # @param [Array] value + def ports=(value) + @config["BRIDGE_PORTS"] = value.join(" ") + end + private def interfaces diff --git a/src/lib/y2network/widgets/bridge_ports.rb b/src/lib/y2network/widgets/bridge_ports.rb index 20cca779b..7ffc43e58 100644 --- a/src/lib/y2network/widgets/bridge_ports.rb +++ b/src/lib/y2network/widgets/bridge_ports.rb @@ -11,6 +11,7 @@ module Widgets class BridgePorts < CWM::MultiSelectionBox include SlaveItems + # @param [Y2Network::InterfaceConfigBuilders::Bridge] settings def initialize(settings) textdomain "network" @settings = settings @@ -27,7 +28,7 @@ def help # Default function to init the value of slave devices box for bridging. def init - br_ports = @settings["BRIDGE_PORTS"].split + br_ports = @settings.ports items = slave_items_from( @settings.bridgeable_interfaces.map(&:name), br_ports @@ -39,8 +40,7 @@ def init # Default function to store the value of slave devices box. def store - # TODO: fix it in builder to use array and not space separated string - @settings["BRIDGE_PORTS"] = value.join(" ") + @settings.ports = value end # Validates created bridge. Currently just prevent the user to create a From a32605a8d84e377dac17ff9713c1f76c4ae9c17c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 09:30:25 +0200 Subject: [PATCH 067/471] ethtools accessor --- src/lib/y2network/interface_config_builder.rb | 11 +++++++++++ src/lib/y2network/widgets/ethtools_options.rb | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index b90d28657..f2f5ede66 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -229,6 +229,17 @@ def udev_name Yast::LanItems.current_udev_name end + # TODO: eth only? + # @return [String] + def ethtool_options + @config["ETHTOOL_OPTIONS"] + end + + # @param [String] value + def ethtool_options=(value) + @config["ETHTOOL_OPTIONS"] = value + end + # Provides stored configuration in sysconfig format # # @return [Hash] where key is sysconfig option and value is the option's value diff --git a/src/lib/y2network/widgets/ethtools_options.rb b/src/lib/y2network/widgets/ethtools_options.rb index df62983e8..3f8a709b0 100644 --- a/src/lib/y2network/widgets/ethtools_options.rb +++ b/src/lib/y2network/widgets/ethtools_options.rb @@ -25,11 +25,11 @@ def opt end def init - self.value = @settings["ETHTOOL_OPTIONS"] + self.value = @settings.ethtool_options end def store - @settings["ETHTOOL_OPTIONS"] = value + @settings.ethtool_options = value end end end From 656ae16bf79f5ccbdae50eb800fd2f07e3e68754 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 09:41:07 +0200 Subject: [PATCH 068/471] Accessor for ip address --- src/lib/y2network/interface_config_builder.rb | 10 ++++++++++ src/lib/y2network/widgets/ip_address.rb | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index f2f5ede66..b33068aa2 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -240,6 +240,16 @@ def ethtool_options=(value) @config["ETHTOOL_OPTIONS"] = value end + # @return [String] + def ip_address + @config["IPADDR"] + end + + # @param [String] value + def ip_address=(value) + @config["IPADDR"] = value + end + # Provides stored configuration in sysconfig format # # @return [Hash] where key is sysconfig option and value is the option's value diff --git a/src/lib/y2network/widgets/ip_address.rb b/src/lib/y2network/widgets/ip_address.rb index aec71feb9..9507b4b99 100644 --- a/src/lib/y2network/widgets/ip_address.rb +++ b/src/lib/y2network/widgets/ip_address.rb @@ -27,11 +27,11 @@ def opt end def init - self.value = @settings["IPADDR"] + self.value = @settings.ip_address end def store - @settings["IPADDR"] = value + @settings.ip_address = value end def validate From ea1fb74b1011bb795e6bef8a9691672ceef38811 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 10:15:12 +0200 Subject: [PATCH 069/471] add mtu accessor --- src/lib/y2network/interface_config_builder.rb | 12 ++++++++++++ src/lib/y2network/widgets/mtu.rb | 6 +++--- test/y2network/widgets/bond_options_test.rb | 4 +++- test/y2network/widgets/mtu_test.rb | 4 +++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index b33068aa2..900bdaefe 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -250,6 +250,18 @@ def ip_address=(value) @config["IPADDR"] = value end + # Gets Maximum Transition Unit + # @return [String] + def mtu + @config["MTU"] + end + + # Sets Maximum Transition Unit + # @param [String] value + def mtu=(value) + @config["MTU"] = value + end + # Provides stored configuration in sysconfig format # # @return [Hash] where key is sysconfig option and value is the option's value diff --git a/src/lib/y2network/widgets/mtu.rb b/src/lib/y2network/widgets/mtu.rb index 6d30feab9..fbb6a9646 100644 --- a/src/lib/y2network/widgets/mtu.rb +++ b/src/lib/y2network/widgets/mtu.rb @@ -34,16 +34,16 @@ def ipoib_items end def items - @settings["IFCFGTYPE"] == "ib" ? ipoib_items : default_items + @settings.type.infiniband? ? ipoib_items : default_items end def init change_items(items) - self.value = @settings["MTU"] + self.value = @settings.mtu end def store - @settings["MTU"] = value + @settings.mtu = value end end end diff --git a/test/y2network/widgets/bond_options_test.rb b/test/y2network/widgets/bond_options_test.rb index d3370f76a..bb1269841 100644 --- a/test/y2network/widgets/bond_options_test.rb +++ b/test/y2network/widgets/bond_options_test.rb @@ -21,9 +21,11 @@ require "cwm/rspec" require "y2network/widgets/bond_options" +require "y2network/interface_config_builder" describe Y2Network::Widgets::BondOptions do - subject { described_class.new({}) } + let(:builder) { Y2Network::InterfaceConfigBuilder.for("bond") } + subject { described_class.new(builder) } include_examples "CWM::ComboBox" end diff --git a/test/y2network/widgets/mtu_test.rb b/test/y2network/widgets/mtu_test.rb index 3f460782a..b83f74545 100644 --- a/test/y2network/widgets/mtu_test.rb +++ b/test/y2network/widgets/mtu_test.rb @@ -21,9 +21,11 @@ require "cwm/rspec" require "y2network/widgets/mtu" +require "y2network/interface_config_builder" describe Y2Network::Widgets::MTU do - subject { described_class.new({}) } + let(:builder) { Y2Network::InterfaceConfigBuilder.for("eth") } + subject { described_class.new(builder) } include_examples "CWM::ComboBox" end From 95d00365514e0d1b0d44b70838985463132fe1fe Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 10:29:19 +0200 Subject: [PATCH 070/471] add subnet prefix accessor --- src/lib/y2network/interface_config_builder.rb | 20 +++++++++++++++++++ src/lib/y2network/widgets/netmask.rb | 14 ++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 900bdaefe..079de1b39 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -26,6 +26,7 @@ Yast.import "LanItems" Yast.import "NetworkInterfaces" +Yast.import "Netmask" module Y2Network # Collects data from the UI until we have enough of it to create a {Y2Network::Interface}. @@ -250,6 +251,25 @@ def ip_address=(value) @config["IPADDR"] = value end + # @return [String] returns prefix or netmask. prefix in format "/" + def subnet_prefix + if @config["PREFIXLEN"] && !@config["PREFIXLEN"].empty? + "/#{@config["PREFIXLEN"]}" + else + @config["NETMASK"] || "" + end + end + + # @param [String] value prefix or netmask is accepted. prefix in format "/" + def subnet_prefix=(value) + if value.start_with?("/") + @settings["PREFIXLEN"] = value[1..-1] + else + param = Yast::Netmask.Check6(value) ? "PREFIXLEN" : "NETMASK" + @settings[param] = value + end + end + # Gets Maximum Transition Unit # @return [String] def mtu diff --git a/src/lib/y2network/widgets/netmask.rb b/src/lib/y2network/widgets/netmask.rb index fb6d3eec3..1f9628b32 100644 --- a/src/lib/y2network/widgets/netmask.rb +++ b/src/lib/y2network/widgets/netmask.rb @@ -28,21 +28,11 @@ def opt end def init - self.value = if @settings["PREFIXLEN"] && !@settings["PREFIXLEN"].empty? - "/#{@settings["PREFIXLEN"]}" - else - @settings["NETMASK"] || "" - end + self.value = @settings.subnet_prefix end def store - mask = value - if mask.start_with?("/") - @settings["PREFIXLEN"] = mask[1..-1] - else - param = Yast::Netmask.Check6(mask) ? "PREFIXLEN" : "NETMASK" - @settings[param] = mask - end + @settings.subnet_prefix = value end def validate From 713a396ba145a40e4ac8d524568d7a6e1bafb1c3 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 10:53:46 +0200 Subject: [PATCH 071/471] add remote ip accessor --- src/lib/y2network/interface_config_builder.rb | 11 +++++++++++ src/lib/y2network/widgets/remote_ip.rb | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 079de1b39..547dbd535 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -270,6 +270,17 @@ def subnet_prefix=(value) end end + # sets remote ip for ptp connections + # @return [String] + def remote_ip + @config["REMOTEIP"] + end + + # @param [String] value + def remote_ip=(value) + @config["REMOTEIP"] = value + end + # Gets Maximum Transition Unit # @return [String] def mtu diff --git a/src/lib/y2network/widgets/remote_ip.rb b/src/lib/y2network/widgets/remote_ip.rb index 085e56ede..43a4a3565 100644 --- a/src/lib/y2network/widgets/remote_ip.rb +++ b/src/lib/y2network/widgets/remote_ip.rb @@ -25,11 +25,11 @@ def help end def init - self.value = @settings["REMOTEIP"] + self.value = @settings.remote_ip end def store - @settings["REMOTEIP"] = value + @settings.remote_ip = value end def validate From 5036dc563d816666773e8951f4e61cb1a5c71a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2019 11:00:28 +0100 Subject: [PATCH 072/471] Add an IPAddress#netmask= method --- src/lib/y2network/ip_address.rb | 7 +++++++ src/lib/y2network/sysconfig/interface_file.rb | 2 +- test/y2network/ip_address_test.rb | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index 8de535f9b..e22a8508e 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -75,6 +75,13 @@ def to_s host? ? @address.to_s : "#{@address}/#{@prefix}" end + # Sets the prefix from a netmask + # + # @param netmask [String] String representation of the netmask + def netmask=(netmask) + self.prefix = IPAddr.new("#{netmask}/#{netmask}").prefix + end + # Determines whether two addresses are equivalent # # @param other [IPAddress] The address to compare with diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 6e94b2e42..8db732c29 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -164,7 +164,7 @@ def variable_name(param_name) # !@attribute [r] prefixlens # @return [Hash] Prefixes lengths - define_collection_variable(:prefixlen, :ipaddr) + define_collection_variable(:prefixlen, :integer) # !@attribute [r] netmasks # @return [Hash] Netmasks diff --git a/test/y2network/ip_address_test.rb b/test/y2network/ip_address_test.rb index 6fa15ff65..c96a2a120 100644 --- a/test/y2network/ip_address_test.rb +++ b/test/y2network/ip_address_test.rb @@ -21,6 +21,8 @@ require "y2network/ip_address" describe Y2Network::IPAddress do + subject(:ip) { described_class.new("192.168.122.1", 24) } + describe ".from_string" do context "when a string representing an IPv4 is given" do let(:ip_address) { "192.168.122.1/24" } @@ -79,6 +81,18 @@ end end + describe "#prefix=" do + it "sets the address prefix" do + expect { ip.prefix = 32 }.to change { ip.prefix }.from(24).to(32) + end + end + + describe "#netmask=" do + it "sets the address prefix" do + expect { ip.netmask = "255.255.255.255" }.to change { ip.prefix }.from(24).to(32) + end + end + describe "#==" do context "when address and prefix are the same" do it "returns true" do From ddfd9ec4f641f14f96dbe72549703fd12ea6131a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2019 11:33:34 +0100 Subject: [PATCH 073/471] Read NETMASK* variables from ifcfg-* files --- .../connection_config_readers/base.rb | 23 ++++++++++++++++--- src/lib/y2network/sysconfig/interface_file.rb | 3 ++- .../scr_read/etc/sysconfig/network/ifcfg-eth2 | 6 +++-- .../scr_read/etc/sysconfig/network/ifcfg-eth3 | 7 +++--- .../scr_read/etc/sysconfig/network/ifcfg-eth4 | 5 ++++ .../ethernet_test.rb | 21 ++++++++++++++++- .../sysconfig/interface_file_test.rb | 4 ++-- 7 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-eth4 diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 4a3955b17..59f6900cf 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "y2network/connection_config/ip_config" +require "y2network/ip_address" module Y2Network module Sysconfig @@ -34,16 +35,18 @@ def initialize(file) @file = file end + private + # Returns the IPs configuration from the file # # @return [Array] IP addresses configuration # @see Y2Network::ConnectionConfig::IPConfig def ip_configs file.ipaddrs.map do |id, ip| - prefix = file.prefixlens[id] - ip.prefix = prefix if prefix + next unless ip.is_a?(Y2Network::IPAddress) + ip_address = build_ip(ip, file.prefixlens[id], file.netmasks[id]) Y2Network::ConnectionConfig::IPConfig.new( - ip, + ip_address, id: id, label: file.labels[id], remote_address: file.remote_ipaddrs[id], @@ -51,6 +54,20 @@ def ip_configs ) end end + + # Builds an IP address + # + # It takes an IP address and, optionally, a prefix or a netmask. + # + # @param ip [Y2Network::IPAddress] IP address + # @param prefix [Integer,nil] Address prefix + # @param netmask [String,nil] Netmask + def build_ip(ip, prefix, netmask) + ipaddr = ip.clone + ipaddr.netmask = netmask if netmask + ipaddr.prefix = prefix if prefix + ipaddr + end end end end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 8db732c29..2fa3868ab 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -168,7 +168,8 @@ def variable_name(param_name) # !@attribute [r] netmasks # @return [Hash] Netmasks - define_collection_variable(:netmask, :ipaddr) + define_collection_variable(:netmask) + # !@attribute [r] wireless_key_length # @return [Integer] Length in bits for all keys used define_variable(:wireless_key_length, :integer) diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 index b8b737f9f..7caf76410 100644 --- a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth2 @@ -1,5 +1,7 @@ -BOOTPROTO='dhcp' +BOOTPROTO='static' BROADCAST='' MTU='' -NAME='Ethernet Card 0' +IPADDR='172.16.0.1' +PREFIXLEN='12' +NAME='Ethernet Card 2' STARTMODE='auto' diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 index bf578ffcc..b595cee76 100644 --- a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth3 @@ -1,6 +1,7 @@ -BOOTPROTO='' +BOOTPROTO='static' BROADCAST='' MTU='' -IPADDR='' -NAME='Ethernet Card 0' +IPADDR='10.0.0.1' +NETMASK='255.0.0.0' +NAME='Ethernet Card 3' STARTMODE='auto' diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth4 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth4 new file mode 100644 index 000000000..ab0b8cffb --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth4 @@ -0,0 +1,5 @@ +BOOTPROTO='dhcp' +BROADCAST='' +MTU='' +NAME='Ethernet Card 4' +STARTMODE='auto' diff --git a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb index 39bda0339..f58800d58 100644 --- a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb @@ -31,8 +31,9 @@ change_scr_root(scr_root, &example) end + let(:interface_name) { "eth0" } let(:file) do - Y2Network::Sysconfig::InterfaceFile.find("eth0").tap(&:load) + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) end describe "#connection_config" do @@ -42,5 +43,23 @@ expect(eth.ip_configs.map(&:address)).to eq([Y2Network::IPAddress.from_string("192.168.123.1/24")]) expect(eth.bootproto).to eq(Y2Network::BootProtocol::STATIC) end + + context "when prefixlen is specified" do + let(:interface_name) { "eth2" } + + it "uses the prefixlen as the address prefix" do + eth = handler.connection_config + expect(eth.ip_configs.map(&:address)).to eq([Y2Network::IPAddress.from_string("172.16.0.1/12")]) + end + end + + context "when netmask is specified" do + let(:interface_name) { "eth3" } + + it "uses the netmask to set the address prefix" do + eth = handler.connection_config + expect(eth.ip_configs.map(&:address)).to eq([Y2Network::IPAddress.from_string("10.0.0.1/8")]) + end + end end end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 95cf0cc97..1ea119c9e 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -75,7 +75,7 @@ def file_content(scr_root, file) end context "when the IP address is missing" do - let(:interface_name) { "eth2" } + let(:interface_name) { "eth4" } it "returns an empty hash" do expect(file.ipaddrs).to be_empty @@ -84,7 +84,7 @@ def file_content(scr_root, file) end describe "#ipaddrs=" do - let(:interface_name) { "eth2" } + let(:interface_name) { "eth4" } it "sets the bootproto" do addresses = { default: Y2Network::IPAddress.from_string("10.0.0.1") } From c6e9cfa44864468cff08bca3810a35bf609c861e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 12:41:07 +0200 Subject: [PATCH 074/471] add accessor for tunnel owner --- src/lib/y2network/interface_config_builder.rb | 10 ++++++++++ src/lib/y2network/widgets/tunnel.rb | 11 +++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 547dbd535..eaaff6fc0 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -293,6 +293,16 @@ def mtu=(value) @config["MTU"] = value end + # @return [Array(2)] user and group of tunnel + def tunnel_user_group + [@config["TUNNEL_SET_OWNER"], @config["TUNNEL_SET_GROUP"]] + end + + def assign_tunnel_user_group(user, group) + @config["TUNNEL_SET_OWNER"] = user + @config["TUNNEL_SET_GROUP"] = group + end + # Provides stored configuration in sysconfig format # # @return [Hash] where key is sysconfig option and value is the option's value diff --git a/src/lib/y2network/widgets/tunnel.rb b/src/lib/y2network/widgets/tunnel.rb index bc295c356..9629b139c 100644 --- a/src/lib/y2network/widgets/tunnel.rb +++ b/src/lib/y2network/widgets/tunnel.rb @@ -26,14 +26,17 @@ def help def init log.info "init tunnel with #{@settings.inspect}" + owner, group = @settings.tunnel_user_group - Yast::UI.ChangeWidget(:tunnel_owner, :Value, @settings["TUNNEL_SET_OWNER"] || "") - Yast::UI.ChangeWidget(:tunnel_group, :Value, @settings["TUNNEL_SET_GROUP"] || "") + Yast::UI.ChangeWidget(:tunnel_owner, :Value, owner || "") + Yast::UI.ChangeWidget(:tunnel_group, :Value, group || "") end def store - @settings["TUNNEL_SET_OWNER"] = Yast::UI.QueryWidget(:tunnel_owner, :Value) - @settings["TUNNEL_SET_GROUP"] = Yast::UI.QueryWidget(:tunnel_group, :Value) + @settings.assign_tunnel_user_group( + Yast::UI.QueryWidget(:tunnel_owner, :Value), + Yast::UI.QueryWidget(:tunnel_group, :Value) + ) end end end From 7885189d02ce52e5e370763670745bdc7bbf6e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2019 11:54:29 +0100 Subject: [PATCH 075/471] Prefix set in IPADDR* has precedence * Y2Network::IPAddress allows nil as prefix --- src/lib/y2network/ip_address.rb | 16 ++++--------- .../connection_config_readers/base.rb | 1 + test/y2network/ip_address_test.rb | 24 +++++++++++++++---- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index e22a8508e..c7d8451c0 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -54,11 +54,6 @@ def from_string(str) end end - # @return [Integer] IPv4 address default prefix - IPV4_DEFAULT_PREFIX = 32 - # @return [Integer] IPv6 address default prefix - IPV6_DEFAULT_PREFIX = 128 - # Constructor # # @param address [String] IP address without the prefix @@ -67,12 +62,11 @@ def from_string(str) def initialize(address, prefix = nil) @address = IPAddr.new(address) @prefix = prefix - @prefix ||= @address.ipv4? ? IPV4_DEFAULT_PREFIX : IPV6_DEFAULT_PREFIX end # Returns a string representation of the address def to_s - host? ? @address.to_s : "#{@address}/#{@prefix}" + prefix? ? "#{@address}/#{@prefix}" : @address.to_s end # Sets the prefix from a netmask @@ -92,13 +86,11 @@ def ==(other) alias_method :eql?, :== - private - - # Determines whether it is a host address + # Determines whether a prefix is defined # # @return [Boolean] - def host? - (ipv4? && prefix == IPV4_DEFAULT_PREFIX) || (ipv6? && prefix == IPV6_DEFAULT_PREFIX) + def prefix? + !!@prefix end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 59f6900cf..82ace5641 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -64,6 +64,7 @@ def ip_configs # @param netmask [String,nil] Netmask def build_ip(ip, prefix, netmask) ipaddr = ip.clone + return ipaddr if ip.prefix? ipaddr.netmask = netmask if netmask ipaddr.prefix = prefix if prefix ipaddr diff --git a/test/y2network/ip_address_test.rb b/test/y2network/ip_address_test.rb index c96a2a120..95195fb3c 100644 --- a/test/y2network/ip_address_test.rb +++ b/test/y2network/ip_address_test.rb @@ -36,10 +36,10 @@ context "when no prefix is given" do let(:ip_address) { "192.168.122.1" } - it "sets a 32 bits prefix" do + it "does not set a prefix" do ip = described_class.from_string(ip_address) expect(ip.address).to eq(IPAddr.new("192.168.122.1")) - expect(ip.prefix).to eq(32) + expect(ip.prefix).to be_nil end end end @@ -56,10 +56,10 @@ context "when no prefix is given" do let(:ip_address) { "2001:db8:1234:ffff:ffff:ffff:ffff:fff1" } - it "sets a 128 bits prefix" do + it "does not set a prefix" do ip = described_class.from_string(ip_address) expect(ip.address).to eq(IPAddr.new(ip_address)) - expect(ip.prefix).to eq(128) + expect(ip.prefix).to be_nil end end end @@ -116,4 +116,20 @@ end end end + + describe "#prefix?" do + context "when a prefix was set" do + it "returns true" do + expect(ip.prefix?).to eq(true) + end + end + + context "when a prefix was not set" do + subject(:ip) { described_class.new("192.168.122.1") } + + it "returns false" do + expect(ip.prefix?).to eq(false) + end + end + end end From 33f4eb51ec4f07e3725f04f8794df19af602547f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 13:38:19 +0200 Subject: [PATCH 076/471] Add accessor for vlan id --- src/lib/y2network/interface_config_builders/vlan.rb | 12 ++++++++++++ src/lib/y2network/widgets/udev_rules.rb | 1 - src/lib/y2network/widgets/vlan_id.rb | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/interface_config_builders/vlan.rb b/src/lib/y2network/interface_config_builders/vlan.rb index 529d0dfab..4da1a39fd 100644 --- a/src/lib/y2network/interface_config_builders/vlan.rb +++ b/src/lib/y2network/interface_config_builders/vlan.rb @@ -11,10 +11,22 @@ def initialize super(type: InterfaceType::VLAN) end + # @return [Integer] + def vlan_id + (@config["VLAN_ID"] || "0").to_i + end + + # @param [Integer] value + def vlan_id=(value) + @config["VLAN_ID"] = value.to_s + end + + # @return [String] def etherdevice @config["ETHERDEVICE"] end + # @param [String] value def etherdevice=(value) @config["ETHERDEVICE"] = value end diff --git a/src/lib/y2network/widgets/udev_rules.rb b/src/lib/y2network/widgets/udev_rules.rb index c8930a6aa..60dacef04 100644 --- a/src/lib/y2network/widgets/udev_rules.rb +++ b/src/lib/y2network/widgets/udev_rules.rb @@ -23,7 +23,6 @@ def contents end def init - # TODO: get it from settings self.value = @settings.udev_name end diff --git a/src/lib/y2network/widgets/vlan_id.rb b/src/lib/y2network/widgets/vlan_id.rb index e714d3405..0d4974ed1 100644 --- a/src/lib/y2network/widgets/vlan_id.rb +++ b/src/lib/y2network/widgets/vlan_id.rb @@ -19,11 +19,11 @@ def help end def init - self.value = (@config["VLAN_ID"] || "0").to_i + self.value = @config.vlan_id end def store - @config["VLAN_ID"] = value.to_s + @config.vlan_id = value.to_s end def minimum From c87e1bae057c87576a71d6c2cb2d9d25346ae2a3 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 14:22:10 +0200 Subject: [PATCH 077/471] add boot protocol accessor --- src/include/network/lan/address.rb | 2 +- src/lib/y2network/interface_config_builder.rb | 12 +++++++ src/lib/y2network/widgets/boot_protocol.rb | 34 +++++++++---------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index 9c415175f..394eb681f 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -68,7 +68,7 @@ def AddressDialog(builder:) log.info "ShowAndRun: #{ret}" if ret != :back && ret != :abort - bootproto = builder["BOOTPROTO"] + bootproto = builder.boot_protocol ipaddr = builder["IPADDR"] # IP is mandatory for static configuration. Makes no sense to write static diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index eaaff6fc0..51b65a334 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -21,6 +21,7 @@ require "y2network/connection_config/base" require "y2network/hwinfo" require "y2network/startmode" +require "y2network/boot_protocol" require "y2firewall/firewalld" require "y2firewall/firewalld/interface" @@ -150,6 +151,17 @@ def firewall_zone=(value) @firewall_zone = value end + # @return [Y2Network::BootProtocol] + def boot_protocol + Y2Network::BootProtocol.from_name(@config["BOOTPROTO"]) + end + + # @param[String, Y2Network::BootProtocol] + def boot_protocol=(value) + value = value.name if value.is_a?(Y2Network::BootProtocol) + @config["BOOTPROTO"] = value + end + # @return [Startmode] def startmode # in future use only @connection_config and just delegate method diff --git a/src/lib/y2network/widgets/boot_protocol.rb b/src/lib/y2network/widgets/boot_protocol.rb index f9386b079..8102e3eba 100644 --- a/src/lib/y2network/widgets/boot_protocol.rb +++ b/src/lib/y2network/widgets/boot_protocol.rb @@ -1,7 +1,7 @@ require "yast" require "cwm/custom_widget" -require "y2network/interface_type" +require "y2network/boot_protocol" Yast.import "DNS" Yast.import "Hostname" @@ -100,8 +100,8 @@ def init ) end - case @settings["BOOTPROTO"] - when "static" + case @settings.boot_protocol + when Y2Network::BootProtocol::STATIC Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_static) Yast::UI.ChangeWidget( Id(:bootproto_ipaddr), @@ -126,27 +126,27 @@ def init :Value, @settings["HOSTNAME"] ) - when "dhcp" + when Y2Network::BootProtocol::DHCP Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_dynamic) Yast::UI.ChangeWidget(Id(:bootproto_dhcp_mode), :Value, :bootproto_dhcp_both) Yast::UI.ChangeWidget(Id(:bootproto_dyn), :Value, :bootproto_dhcp) - when "dhcp4" + when Y2Network::BootProtocol::DHCP4 Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_dynamic) Yast::UI.ChangeWidget(Id(:bootproto_dhcp_mode), :Value, :bootproto_dhcp_v4) Yast::UI.ChangeWidget(Id(:bootproto_dyn), :Value, :bootproto_dhcp) - when "dhcp6" + when Y2Network::BootProtocol::DHCP6 Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_dynamic) Yast::UI.ChangeWidget(Id(:bootproto_dhcp_mode), :Value, :bootproto_dhcp_v6) Yast::UI.ChangeWidget(Id(:bootproto_dyn), :Value, :bootproto_dhcp) - when "dhcp+autoip" + when Y2Network::BootProtocol::DHCP_AUTOIP Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_dynamic) Yast::UI.ChangeWidget(Id(:bootproto_dyn), :Value, :bootproto_dhcp_auto) - when "autoip" + when Y2Network::BootProtocol::AUTOIP Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_dynamic) Yast::UI.ChangeWidget(Id(:bootproto_dyn), :Value, :bootproto_auto) - when "none" + when Y2Network::BootProtocol::NONE Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_none) - when "ibft" + when Y2Network::BootProtocol::IBFT Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_none) Yast::UI.ChangeWidget(Id(:bootproto_ibft), :Value, true) end @@ -193,9 +193,9 @@ def store if ibft_available? bootproto = Yast::UI.QueryWidget(Id(:bootproto_ibft), :Value) ? "ibft" : "none" end - @settings["BOOTPROTO"] = bootproto + @settings.boot_protocol = bootproto when :bootproto_static - @settings["BOOTPROTO"] = "static" + @settings.boot_protocol = "static" @settings["IPADDR"] = Yast::UI.QueryWidget(:bootproto_ipaddr, :Value) mask = Yast::UI.QueryWidget(:bootproto_netmask, :Value) if mask.start_with?("/") @@ -210,18 +210,18 @@ def store when :bootproto_dhcp case Yast::UI.QueryWidget(:bootproto_dhcp_mode, :Value) when :bootproto_dhcp_both - @settings["BOOTPROTO"] = "dhcp" + @settings.boot_protocol = "dhcp" when :bootproto_dhcp_v4 - @settings["BOOTPROTO"] = "dhcp4" + @settings.boot_protocol = "dhcp4" when :bootproto_dhcp_v6 - @settings["BOOTPROTO"] = "dhcp6" + @settings.boot_protocol = "dhcp6" else raise "Unexpected dhcp mode value #{Yast::UI.QueryWidget(:bootproto_dhcp_mode, :Value).inspect}" end when :bootproto_dhcp_auto - @settings["BOOTPROTO"] = "dhcp+autoip" + @settings.boot_protocol = "dhcp+autoip" when :bootproto_auto - @settings["BOOTPROTO"] = "autoip" + @settings.boot_protocol = "autoip" else raise "Unexpected dynamic mode value #{Yast::UI.QueryWidget(:bootproto_dyn, :Value).inspect}" end From f7d811bb2d3fe25f01ea7f28220bd65f8d6407be Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 14:54:59 +0200 Subject: [PATCH 078/471] use accessors where possible --- src/include/network/lan/cmdline.rb | 16 ++++++++-------- src/include/network/lan/complex.rb | 2 +- src/lib/network/network_autoconfiguration.rb | 4 ++-- src/lib/y2network/interface_config_builder.rb | 5 +++-- src/modules/LanItems.rb | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index 6741fafd0..1b53b837c 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -272,19 +272,19 @@ def infered_type(options) # @param builder [Y2Network::InterfaceConfigBuilder] # @return [Boolean] true when the options are valid; false otherwise def validate_config(builder) - if Y2Network::BootProtocol.all.none? { |bp| bp.name == builder["BOOTPROTO"] } + if builder.boot_protocol.nil? Report.Error(_("Impossible value for bootproto.")) return false end - if builder["BOOTPROTO"] == "static" && builder["IPADDR"].empty? + if builder.boot_protocol.name == "static" && builder["IPADDR"].empty? Report.Error( _("For static configuration, the \"ip\" option is needed.") ) return false end - unless ["auto", "ifplugd", "nfsroot"].include? builder["STARTMODE"] + unless ["auto", "ifplugd", "nfsroot"].include?(builder.startmode.name) Report.Error(_("Impossible value for startmode.")) return false end @@ -302,14 +302,14 @@ def update_builder_from_options!(builder, options) when "bond" builder.slaves = options.fetch("slaves", "").split(" ") when "vlan" - builder["ETHERDEVICE"] = options.fetch("ethdevice", "") + builder.etherdevice = options.fetch("ethdevice", "") when "br" - builder["BRIDGE_PORTS"] = options.fetch("bridge_ports", "") + builder.ports = options.fetch("bridge_ports", "") end default_bootproto = options.keys.include?("ip") ? "static" : "none" - builder["BOOTPROTO"] = options.fetch("bootproto", default_bootproto) - if builder["BOOTPROTO"] == "static" + builder.boot_protocol = options.fetch("bootproto", default_bootproto) + if builder.boot_protocol.name == "static" builder["IPADDR"] = options.fetch("ip", "") builder["PREFIX"] = options.fetch("prefix", "") builder["NETMASK"] = options.fetch("netmask", "255.255.255.0") if builder["PREFIX"].empty? @@ -317,7 +317,7 @@ def update_builder_from_options!(builder, options) builder["IPADDR"] = "" builder["NETMASK"] = "" end - builder["STARTMODE"] = options.fetch("startmode", "auto") + builder.startmode = options.fetch("startmode", "auto") end end end diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index 5585235f4..dd71eac45 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -329,7 +329,7 @@ def UpdateSlaves # clear defaults, some defaults are invalid for slaves and can cause troubles # in related sysconfig scripts or makes no sence for slaves (e.g. ip configuration). builder["NETMASK"] = "" - builder["BOOTPROTO"] = "none" + builder.boot_protocol = "none" case master_builder.type.short_name when "bond" LanItems.startmode = "hotplug" diff --git a/src/lib/network/network_autoconfiguration.rb b/src/lib/network/network_autoconfiguration.rb index 3e6026ce9..114b10e0b 100644 --- a/src/lib/network/network_autoconfiguration.rb +++ b/src/lib/network/network_autoconfiguration.rb @@ -141,8 +141,8 @@ def setup_dhcp(card) current["ifcfg"] = card end - builder["BOOTPROTO"] = "dhcp" - builder["STARTMODE"] = "auto" + builder.boot_protocol = "dhcp" + builder.startmode = "auto" LanItems.Commit(builder) end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 51b65a334..ed4ee0bfb 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -170,9 +170,10 @@ def startmode startmode end - # @param [String] name startmode name used to create Startmode object + # @param [String,Y2Network::Startmode] name startmode name used to create Startmode object + # or object itself def startmode=(name) - mode = Startmode.create(name) + mode = name.is_a?(Startmode) ? name : Startmode.create(name) # assign only if it is not already this value. This helps with ordering of ifplugd_priority @connection_config.startmode = mode if @connection_config.startmode.name != mode.name @config["STARTMODE"] = mode.name diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 19c8b9d34..b6d5fc550 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1978,15 +1978,15 @@ def ProposeItem(item_id) type = Items().fetch(item_id, {}).fetch("hwinfo", {})[type] builder = Y2Network::InterfaceConfigBuilder.for(type) - builder["MTU"] = "1492" if Arch.s390 && Builtins.contains(["lcs", "eth"], type) + builder.mtu = "1492" if Arch.s390 && Builtins.contains(["lcs", "eth"], type) builder["IPADDR"] = "" builder["NETMASK"] = "" - builder["BOOTPROTO"] = "dhcp" + builder.boot_protocol = Y2Network::BootProtocol::DHCP # see bsc#176804 devicegraph = Y2Storage::StorageManager.instance.staging if devicegraph.filesystem_in_network?("/") - builder["STARTMODE"] = "nfsroot" + builder.startmode = "nfsroot" Builtins.y2milestone("startmode nfsroot") end From 894c2aa0d4c460ded75aa5d632658ad8a854a7d4 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 15:52:53 +0200 Subject: [PATCH 079/471] remove rest of direct access to interface builder config --- src/include/network/lan/address.rb | 4 +- src/include/network/lan/cmdline.rb | 13 +++---- src/include/network/lan/complex.rb | 4 +- src/lib/y2network/interface_config_builder.rb | 32 ++++++++++++++-- src/lib/y2network/startmode.rb | 7 ++++ src/lib/y2network/widgets/boot_protocol.rb | 37 ++++++------------- src/modules/LanItems.rb | 10 ++--- 7 files changed, 62 insertions(+), 45 deletions(-) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index 394eb681f..dc5a154d9 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -69,14 +69,14 @@ def AddressDialog(builder:) if ret != :back && ret != :abort bootproto = builder.boot_protocol - ipaddr = builder["IPADDR"] + ipaddr = builder.ip_address # IP is mandatory for static configuration. Makes no sense to write static # configuration without that. return ret if bootproto == "static" && ipaddr.empty? if bootproto == "static" - update_hostname(ipaddr, builder["HOSTNAME"] || "") + update_hostname(ipaddr, builder.hostname || "") elsif LanItems.isCurrentDHCP && !LanItems.isCurrentHotplug # fixed bug #73739 - if dhcp is used, dont set default gw statically # but also: reset default gw only if DHCP* is used, this branch covers diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index 1b53b837c..4a4d481f7 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -277,14 +277,14 @@ def validate_config(builder) return false end - if builder.boot_protocol.name == "static" && builder["IPADDR"].empty? + if builder.boot_protocol.name == "static" && builder.ip_address.empty? Report.Error( _("For static configuration, the \"ip\" option is needed.") ) return false end - unless ["auto", "ifplugd", "nfsroot"].include?(builder.startmode.name) + unless builder.startmode Report.Error(_("Impossible value for startmode.")) return false end @@ -310,12 +310,11 @@ def update_builder_from_options!(builder, options) default_bootproto = options.keys.include?("ip") ? "static" : "none" builder.boot_protocol = options.fetch("bootproto", default_bootproto) if builder.boot_protocol.name == "static" - builder["IPADDR"] = options.fetch("ip", "") - builder["PREFIX"] = options.fetch("prefix", "") - builder["NETMASK"] = options.fetch("netmask", "255.255.255.0") if builder["PREFIX"].empty? + builder.ip_address = options.fetch("ip", "") + builder.subnet_prefix = options.fetch("prefix", options.fetch("netmask", "255.255.255.0")) else - builder["IPADDR"] = "" - builder["NETMASK"] = "" + builder.ip_address = "" + builder.subnet_prefix = "" end builder.startmode = options.fetch("startmode", "auto") end diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index dd71eac45..fec4f28bc 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -328,7 +328,7 @@ def UpdateSlaves end # clear defaults, some defaults are invalid for slaves and can cause troubles # in related sysconfig scripts or makes no sence for slaves (e.g. ip configuration). - builder["NETMASK"] = "" + builder.subnet_prefix = "" builder.boot_protocol = "none" case master_builder.type.short_name when "bond" @@ -338,7 +338,7 @@ def UpdateSlaves LanItems.update_item_udev_rule!(:bus_id) end when "br" - builder["IPADDR"] = "" + builder.ip_address = "" else raise "Adapting slaves for wrong type #{master_builder.type.inspect}" end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index ed4ee0bfb..2f3e2097f 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -166,6 +166,8 @@ def boot_protocol=(value) def startmode # in future use only @connection_config and just delegate method startmode = Startmode.create(@config["STARTMODE"]) + return nil unless startmode + startmode.priority = @config["IFPLUGD_PRIORITY"] if startmode.name == "ifplugd" startmode end @@ -174,8 +176,15 @@ def startmode # or object itself def startmode=(name) mode = name.is_a?(Startmode) ? name : Startmode.create(name) + if !mode # invalid startmode e.g. in CLI + @config["STARTMODE"] = "" + return + end + # assign only if it is not already this value. This helps with ordering of ifplugd_priority - @connection_config.startmode = mode if @connection_config.startmode.name != mode.name + if !@connection_config.startmode || @connection_config.startmode.name != mode.name + @connection_config.startmode = mode + end @config["STARTMODE"] = mode.name end @@ -275,14 +284,29 @@ def subnet_prefix # @param [String] value prefix or netmask is accepted. prefix in format "/" def subnet_prefix=(value) - if value.start_with?("/") - @settings["PREFIXLEN"] = value[1..-1] + if value.empty? + @config["PREFIXLEN"] = "" + @config["NETMASK"] = "" + elsif value.start_with?("/") + @config["PREFIXLEN"] = value[1..-1] + elsif value.size < 3 # one or two digits can be only prefixlen + @config["PREFIXLEN"] = value else param = Yast::Netmask.Check6(value) ? "PREFIXLEN" : "NETMASK" - @settings[param] = value + @config[param] = value end end + # @return [String] + def hostname + @config["HOSTNAME"] + end + + # @param [String] value + def hostname=(value) + @config["HOSTNAME"] = value + end + # sets remote ip for ptp connections # @return [String] def remote_ip diff --git a/src/lib/y2network/startmode.rb b/src/lib/y2network/startmode.rb index fc8068f90..170d67c65 100644 --- a/src/lib/y2network/startmode.rb +++ b/src/lib/y2network/startmode.rb @@ -17,11 +17,15 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "yast" + module Y2Network # Base class for startmode. It allows to create new one according to name or anlist all. # Its child have to define `to_human_string` method and possibly its own specialized attributes. # TODO: as backends differs, we probably also need to have flag there to which backends mode exists class Startmode + include Yast::Logger + attr_reader :name alias_method :to_s, :name @@ -34,6 +38,9 @@ def self.create(name) # avoid circular dependencies require "y2network/startmodes" Startmodes.const_get(name.capitalize).new + rescue NameError => e + log.error "Invalid startmode #{e.inspect}" + nil end def self.all diff --git a/src/lib/y2network/widgets/boot_protocol.rb b/src/lib/y2network/widgets/boot_protocol.rb index 8102e3eba..3bcd919ed 100644 --- a/src/lib/y2network/widgets/boot_protocol.rb +++ b/src/lib/y2network/widgets/boot_protocol.rb @@ -106,25 +106,17 @@ def init Yast::UI.ChangeWidget( Id(:bootproto_ipaddr), :Value, - @settings["IPADDR"] || "" + @settings.ip_address + ) + Yast::UI.ChangeWidget( + Id(:bootproto_netmask), + :Value, + @settings.subnet_prefix ) - if @settings["PREFIXLEN"] && !@settings["PREFIXLEN"].empty? - Yast::UI.ChangeWidget( - Id(:bootproto_netmask), - :Value, - "/#{@settings["PREFIXLEN"]}" - ) - else - Yast::UI.ChangeWidget( - Id(:bootproto_netmask), - :Value, - @settings["NETMASK"] || "" - ) - end Yast::UI.ChangeWidget( Id(:bootproto_hostname), :Value, - @settings["HOSTNAME"] + @settings.hostname ) when Y2Network::BootProtocol::DHCP Yast::UI.ChangeWidget(Id(:bootproto), :CurrentButton, :bootproto_dynamic) @@ -186,7 +178,8 @@ def handle def store # FIXME: this value reset should be in backend in general not Yast::UI responsibility - @settings["IPADDR"] = @settings["NETMASK"] = @settings["PREFIXLEN"] = "" + @settings.ip_address = "" + @settings.subnet_prefix = "" case value when :bootproto_none bootproto = "none" @@ -196,15 +189,9 @@ def store @settings.boot_protocol = bootproto when :bootproto_static @settings.boot_protocol = "static" - @settings["IPADDR"] = Yast::UI.QueryWidget(:bootproto_ipaddr, :Value) - mask = Yast::UI.QueryWidget(:bootproto_netmask, :Value) - if mask.start_with?("/") - @settings["PREFIXLEN"] = mask[1..-1] - else - param = Yast::Netmask.Check6(mask) ? "PREFIXLEN" : "NETMASK" - @settings[param] = mask - end - @settings["HOSTNAME"] = Yast::UI.QueryWidget(:bootproto_hostname, :Value) + @settings.ip_address = Yast::UI.QueryWidget(:bootproto_ipaddr, :Value) + @settings.subnet_prefix = Yast::UI.QueryWidget(:bootproto_netmask, :Value) + @settings.hostname = Yast::UI.QueryWidget(:bootproto_hostname, :Value) when :bootproto_dynamic case Yast::UI.QueryWidget(:bootproto_dyn, :Value) when :bootproto_dhcp diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index b6d5fc550..a9d4e5e12 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1866,10 +1866,10 @@ def Commit(builder) Builtins.y2debug("%1", NetworkInterfaces.ConcealSecrets1(newdev)) # configure bridge ports - bridge_ports = builder["BRIDGE_PORTS"] - if bridge_ports + if builder.type.bridge? + bridge_ports = builder.ports log.info "Configuring bridge ports #{bridge_ports} for: #{ifcfg_name}" - bridge_ports.split.each { |bp| configure_as_bridge_port(bp) } + bridge_ports.each { |bp| configure_as_bridge_port(bp) } end SetModified() @@ -1979,8 +1979,8 @@ def ProposeItem(item_id) builder = Y2Network::InterfaceConfigBuilder.for(type) builder.mtu = "1492" if Arch.s390 && Builtins.contains(["lcs", "eth"], type) - builder["IPADDR"] = "" - builder["NETMASK"] = "" + builder.ip_address = "" + builder.subnet_prefix = "" builder.boot_protocol = Y2Network::BootProtocol::DHCP # see bsc#176804 From a0fd45badc599aded7d1076cc637890fccf74b17 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 15:53:36 +0200 Subject: [PATCH 080/471] remove direct access to interface builder config --- src/lib/y2network/interface_config_builder.rb | 12 ----- test/y2network/widgets/boot_protocol_test.rb | 48 +++++++++---------- .../widgets/ifplugd_priority_test.rb | 4 +- 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 2f3e2097f..165f29816 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -70,18 +70,6 @@ def newly_added? Yast::LanItems.operation == :add end - # changes internal config keys. - # @note always prefer specialized method if available - def []=(key, value) - @config[key] = value - end - - # gets internal config keys. - # @note always prefer specialized method if available - def [](key) - @config[key] - end - # saves builder content to backend # @ TODO now still LanItems actively query config attribute and write it # down, so here mainly workarounds, but ideally this save should change diff --git a/test/y2network/widgets/boot_protocol_test.rb b/test/y2network/widgets/boot_protocol_test.rb index be83b5b41..0be3b7140 100644 --- a/test/y2network/widgets/boot_protocol_test.rb +++ b/test/y2network/widgets/boot_protocol_test.rb @@ -51,10 +51,10 @@ def expect_set_widget(id, value, value_type: :Value) context "static configuration" do before do - builder["BOOTPROTO"] = "static" - builder["IPADDR"] = "10.5.0.6" - builder["PREFIXLEN"] = "24" - builder["HOSTNAME"] = "pepa" + builder.boot_protocol = "static" + builder.ip_address = "10.5.0.6" + builder.subnet_prefix = "24" + builder.hostname = "pepa" allow(subject).to receive(:value).and_return(:bootproto_static) allow(Yast::UI).to receive(:QueryWidget).and_return("pepa") end @@ -86,7 +86,7 @@ def expect_set_widget(id, value, value_type: :Value) context "dhcp configuration" do before do - builder["BOOTPROTO"] = "dhcp" + builder.boot_protocol = "dhcp" allow(subject).to receive(:value).and_return(:bootproto_dynamic) end @@ -97,7 +97,7 @@ def expect_set_widget(id, value, value_type: :Value) context "dhcp4 configuration" do before do - builder["BOOTPROTO"] = "dhcp4" + builder.boot_protocol = "dhcp4" allow(subject).to receive(:value).and_return(:bootproto_dynamic) end @@ -108,7 +108,7 @@ def expect_set_widget(id, value, value_type: :Value) context "dhcp6 configuration" do before do - builder["BOOTPROTO"] = "dhcp6" + builder.boot_protocol = "dhcp6" allow(subject).to receive(:value).and_return(:bootproto_dynamic) end @@ -119,7 +119,7 @@ def expect_set_widget(id, value, value_type: :Value) context "dhcp+autoip configuration" do before do - builder["BOOTPROTO"] = "dhcp+autoip" + builder.boot_protocol = "dhcp+autoip" allow(subject).to receive(:value).and_return(:bootproto_dynamic) end @@ -130,7 +130,7 @@ def expect_set_widget(id, value, value_type: :Value) context "autoip configuration" do before do - builder["BOOTPROTO"] = "autoip" + builder.boot_protocol = "autoip" allow(subject).to receive(:value).and_return(:bootproto_dynamic) end @@ -141,7 +141,7 @@ def expect_set_widget(id, value, value_type: :Value) context "none configuration" do before do - builder["BOOTPROTO"] = "none" + builder.boot_protocol = "none" end it "does not crash" do @@ -151,7 +151,7 @@ def expect_set_widget(id, value, value_type: :Value) context "ibft configuration" do before do - builder["BOOTPROTO"] = "ibft" + builder.boot_protocol = "ibft" end it "does not crash" do @@ -173,7 +173,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["BOOTPROTO"]).to eq "ibft" + expect(builder.boot_protocol.name).to eq "ibft" end it "sets bootproto to none if ibft is not selected" do @@ -181,7 +181,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["BOOTPROTO"]).to eq "none" + expect(builder.boot_protocol.name).to eq "none" end end @@ -195,7 +195,7 @@ def expect_set_widget(id, value, value_type: :Value) it "sets bootproto to static" do subject.store - expect(builder["BOOTPROTO"]).to eq "static" + expect(builder.boot_protocol.name).to eq "static" end it "sets ipaddr to value of ip address widget" do @@ -203,7 +203,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["IPADDR"]).to eq "10.100.0.1" + expect(builder.ip_address).to eq "10.100.0.1" end it "sets hostname to value of hostname widget" do @@ -211,7 +211,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["HOSTNAME"]).to eq "test.suse.cz" + expect(builder.hostname).to eq "test.suse.cz" end it "sets prefixlen when value of netmast start with '/'" do @@ -219,7 +219,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["PREFIXLEN"]).to eq "24" + expect(builder.subnet_prefix).to eq "/24" end it "sets prefixlen for ipv6" do @@ -227,7 +227,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["PREFIXLEN"]).to eq "124" + expect(builder.subnet_prefix).to eq "/124" end it "sets netmask for ipv4 netmask value" do @@ -235,7 +235,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["NETMASK"]).to eq "255.255.0.0" + expect(builder.subnet_prefix).to eq "255.255.0.0" end end @@ -255,7 +255,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["BOOTPROTO"]).to eq "dhcp" + expect(builder.boot_protocol.name).to eq "dhcp" end it "sets bootproto to dhcp4 when dhcp for ipv4 only is selected" do @@ -266,7 +266,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["BOOTPROTO"]).to eq "dhcp4" + expect(builder.boot_protocol.name).to eq "dhcp4" end it "sets bootproto to dhcp6 when dhcp for ipv6 only is selected" do @@ -277,7 +277,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["BOOTPROTO"]).to eq "dhcp6" + expect(builder.boot_protocol.name).to eq "dhcp6" end it "sets bootproto to dhcp+autoip when dhcp and zeroconf is selected" do @@ -286,7 +286,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["BOOTPROTO"]).to eq "dhcp+autoip" + expect(builder.boot_protocol.name).to eq "dhcp+autoip" end it "sets bootproto to autoip when zeroconf is selected" do @@ -295,7 +295,7 @@ def expect_set_widget(id, value, value_type: :Value) subject.store - expect(builder["BOOTPROTO"]).to eq "autoip" + expect(builder.boot_protocol.name).to eq "autoip" end end end diff --git a/test/y2network/widgets/ifplugd_priority_test.rb b/test/y2network/widgets/ifplugd_priority_test.rb index 1a1218dff..0c5e98a33 100644 --- a/test/y2network/widgets/ifplugd_priority_test.rb +++ b/test/y2network/widgets/ifplugd_priority_test.rb @@ -26,7 +26,7 @@ describe Y2Network::Widgets::IfplugdPriority do let(:builder) do res = Y2Network::InterfaceConfigBuilder.for("eth") - res["IFPLUGD_PRIORITY"] = "50" + res.ifplugd_priority = 50 res end subject { described_class.new(builder) } @@ -59,7 +59,7 @@ subject.store - expect(builder["IFPLUGD_PRIORITY"]).to eq "20" + expect(builder.ifplugd_priority).to eq 20 end end end From f3355d76859d784092c8244a31d3d0df03ba702d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2019 15:13:01 +0100 Subject: [PATCH 081/471] Refactor readers/writers --- .../connection_config_readers/base.rb | 38 ++++++++++++++- .../connection_config_readers/ethernet.rb | 19 ++++---- .../connection_config_readers/wireless.rb | 48 +++++++++---------- .../connection_config_writers/base.rb | 30 ++++++++++++ .../connection_config_writers/ethernet.rb | 13 ++--- .../connection_config_writers/wireless.rb | 16 ++----- 6 files changed, 106 insertions(+), 58 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 82ace5641..ac727e51b 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -23,7 +23,10 @@ module Y2Network module Sysconfig module ConnectionConfigReaders - # This is the base class for connection config readers + # This is the base class for connection config readers. + # + # The derived classes should implement {#connection_class} and {#add_connection_settings} + # methods. class Base # @return [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file attr_reader :file @@ -35,8 +38,41 @@ def initialize(file) @file = file end + # Builds a connection configuration object + # + # @return [Y2Network::ConnectionConfig::Base] + def connection_config + connection_class.new.tap do |conn| + conn.bootproto = BootProtocol.from_name(file.bootproto || "static") + conn.description = file.name + conn.interface = file.interface + conn.ip_configs = ip_configs + conn.startmode = Startmode.create(file.startmode || "manual") + conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" + update_connection_config(conn) + end + end + private + # Returns the class of the connection configuration + # + # @note This method should be redefined by derived classes. + # + # @return [Class] + def connection_class + raise NotImplementedError + end + + # Sets connection config settings from the given file + # + # @note This method should be redefined by derived classes. + # + # @param _conn [Y2Network::ConnectionConfig::Base] + def update_connection_config(_conn) + raise NotImplementedError + end + # Returns the IPs configuration from the file # # @return [Array] IP addresses configuration diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb index c57d735b3..c44d9ae16 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb @@ -28,17 +28,16 @@ module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Ethernet object given a # Sysconfig::InterfaceFile object. class Ethernet < Base + private + # @return [Y2Network::ConnectionConfig::Ethernet] - def connection_config - Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| - # for defauls see man ifcfg - conn.bootproto = BootProtocol.from_name(file.bootproto || "static") - conn.description = file.name - conn.interface = file.interface - conn.ip_configs = ip_configs - conn.startmode = Startmode.create(file.startmode || "manual") - conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" - end + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#connection_class + def connection_class + Y2Network::ConnectionConfig::Ethernet + end + + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(_conn) end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index e870b85fb..09749a93c 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -28,34 +28,30 @@ module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Wireless object given a # Sysconfig::InterfaceFile object. class Wireless < Base - # Returns a wireless connection configuration - # - # @return [ConnectionConfig::Wireless] - def connection_config - Y2Network::ConnectionConfig::Wireless.new.tap do |conn| - conn.ap = file.wireless_ap - conn.ap_scanmode = file.wireless_ap_scanmode - conn.auth_mode = file.wireless_auth_mode - conn.bootproto = BootProtocol.from_name(file.bootproto || "static") - conn.default_key = file.wireless_default_key - conn.description = file.name - conn.eap_auth = file.wireless_eap_auth - conn.eap_mode = file.wireless_eap_mode - conn.essid = file.wireless_essid - conn.interface = file.interface - conn.ip_configs = ip_configs - conn.key_length = file.wireless_key_length - conn.keys = wireless_keys - conn.mode = file.wireless_mode - conn.nwid = file.wireless_nwid - conn.startmode = Startmode.create(file.startmode || "manual") - conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" - conn.wpa_password = file.wireless_wpa_password - conn.wpa_psk = file.wireless_wpa_psk - end + private + + # @return [Y2Network::ConnectionConfig::Ethernet] + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#connection_class + def connection_class + Y2Network::ConnectionConfig::Wireless end - private + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(conn) + conn.ap = file.wireless_ap + conn.ap_scanmode = file.wireless_ap_scanmode + conn.auth_mode = file.wireless_auth_mode + conn.default_key = file.wireless_default_key + conn.eap_auth = file.wireless_eap_auth + conn.eap_mode = file.wireless_eap_mode + conn.essid = file.wireless_essid + conn.key_length = file.wireless_key_length + conn.keys = wireless_keys + conn.mode = file.wireless_mode + conn.nwid = file.wireless_nwid + conn.wpa_password = file.wireless_wpa_password + conn.wpa_psk = file.wireless_wpa_psk + end # Max number of wireless keys MAX_WIRELESS_KEYS = 4 diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index 7e358befb..811996f1f 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -33,8 +33,38 @@ def initialize(file) @file = file end + # Writes connection information to the interface configuration file + # + # @param conn [Y2Network::ConnectionConfig::Base] Connection to take settings from + def write(conn) + file.bootproto = conn.bootproto.name + file.name = conn.description + file.startmode = conn.startmode.to_s + file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" + write_ip_configs(conn.ip_configs) + update_file(conn) + end + private + # Returns the class of the connection configuration + # + # @note This method should be redefined by derived classes. + # + # @return [Class] + def connection_class + raise NotImplementedError + end + + # Sets file values from the given connection configuration + # + # @note This method should be redefined by derived classes. + # + # @param _conn [Y2Network::ConnectionConfig::Base] + def update_file(_conn) + raise NotImplementedError + end + # Write IP configuration # # @param ip_configs [Array] IPs configuration diff --git a/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb b/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb index 88c9c56cd..733e3934d 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb @@ -25,15 +25,10 @@ module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Ethernet # object to the underlying system. class Ethernet < Base - # Writes connection information to the interface configuration file - # - # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write - def write(conn) - file.bootproto = conn.bootproto.name - file.name = conn.description - file.startmode = conn.startmode.to_s - file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" - write_ip_configs(conn.ip_configs) + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(_conn) end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb index 90ae58591..592167732 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb @@ -25,26 +25,18 @@ module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Wireless # object to the underlying system. class Wireless < Base - # Writes connection information to the interface configuration file - # - # @param conn [Y2Network::ConnectionConfig::Base] Configuration to write - def write(conn) - file.bootproto = conn.bootproto.name - file.name = conn.description - file.startmode = conn.startmode.to_s - file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(conn) file.wireless_ap = conn.ap file.wireless_ap_scanmode = conn.ap_scanmode file.wireless_essid = conn.essid file.wireless_mode = conn.mode file.wireless_nwid = conn.nwid write_auth_settings(conn) if conn.auth_mode - write_ip_configs(conn.ip_configs) - file end - private - # Writes authentication settings # # This method relies in `write_*_auth_settings` methods. From dc105a9c7ac39d5d61805c2fad788a41fe5455eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2019 16:01:33 +0100 Subject: [PATCH 082/471] Do not mangle ip configs IDs --- src/lib/y2network/connection_config/ip_config.rb | 6 +++--- .../sysconfig/connection_config_readers/base.rb | 3 ++- src/lib/y2network/sysconfig/interface_file.rb | 2 +- .../connection_config_writers/ethernet_test.rb | 16 ++++++++-------- .../connection_config_writers/wireless_test.rb | 16 ++++++++-------- test/y2network/sysconfig/interface_file_test.rb | 4 ++-- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index 36de2e223..e5b1d9b2e 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -27,20 +27,20 @@ class IPConfig attr_accessor :remote_address # @return [IPAddress,nil] Broadcast address attr_accessor :broadcast - # @return [Symbol,String] ID (needed for sysconfig backend in order to write suffixes in + # @return [String,nil] ID (needed for sysconfig backend in order to write suffixes in attr_accessor :id # Constructor # # @param address [IPAddress] - # @param id [Symbol,String] ID (needed for sysconfig backend in order to write suffixes in + # @param id [String] ID (needed for sysconfig backend in order to write suffixes in # ifcfg-* files) # @param label [String,nil] # @param remote_address [IPaddress,nil] # @param broadcast [IPaddress,nil] def initialize(address, id: nil, label: nil, remote_address: nil, broadcast: nil) @address = address - @id = id || :default + @id = id @label = label @remote_address = remote_address @broadcast = broadcast diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index ac727e51b..9283a7927 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -78,7 +78,7 @@ def update_connection_config(_conn) # @return [Array] IP addresses configuration # @see Y2Network::ConnectionConfig::IPConfig def ip_configs - file.ipaddrs.map do |id, ip| + configs = file.ipaddrs.map do |id, ip| next unless ip.is_a?(Y2Network::IPAddress) ip_address = build_ip(ip, file.prefixlens[id], file.netmasks[id]) Y2Network::ConnectionConfig::IPConfig.new( @@ -89,6 +89,7 @@ def ip_configs broadcast: file.broadcasts[id] ) end + configs.sort_by { |c| c.id.nil? ? -1 : 0 } end # Builds an IP address diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 2fa3868ab..4293a7e55 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -330,7 +330,7 @@ def fetch_scalar(key, type) # @return [Hash] def fetch_collection(key, type) collection_keys(key).each_with_object({}) do |k, h| - index = key == k ? :default : k.sub(key, "") + index = k.sub(key, "") h[index] = fetch_scalar(k, type) end end diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index e7d470938..e9c9774c8 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -48,12 +48,12 @@ def file_content(scr_root, file) let(:ip_configs) do [ Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.122.1/24"), id: :default, - broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + Y2Network::IPAddress.from_string("192.168.122.1/24"), + id: "", broadcast: Y2Network::IPAddress.from_string("192.168.122.255") ), Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.1/8"), id: "_0", - label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") + Y2Network::IPAddress.from_string("10.0.0.1/8"), + id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") ) ] end @@ -84,10 +84,10 @@ def file_content(scr_root, file) it "sets IP configuration attributes" do handler.write(conn) expect(file).to have_attributes( - ipaddrs: { default: ip_configs[0].address, "_0" => ip_configs[1].address }, - broadcasts: { default: ip_configs[0].broadcast, "_0" => nil }, - remote_ipaddrs: { default: nil, "_0" => ip_configs[1].remote_address }, - labels: { default: nil, "_0" => "my-label" } + ipaddrs: { "" => ip_configs[0].address, "_0" => ip_configs[1].address }, + broadcasts: { "" => ip_configs[0].broadcast, "_0" => nil }, + remote_ipaddrs: { "" => nil, "_0" => ip_configs[1].remote_address }, + labels: { "" => nil, "_0" => "my-label" } ) end end diff --git a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb index 5b948a617..7215925cf 100644 --- a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb @@ -47,12 +47,12 @@ let(:ip_configs) do [ Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.122.1/24"), id: :default, - broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + Y2Network::IPAddress.from_string("192.168.122.1/24"), + id: "", broadcast: Y2Network::IPAddress.from_string("192.168.122.255") ), Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.1/8"), id: "_0", - label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") + Y2Network::IPAddress.from_string("10.0.0.1/8"), + id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") ) ] end @@ -73,10 +73,10 @@ it "sets IP configuration attributes" do handler.write(conn) expect(file).to have_attributes( - ipaddrs: { default: ip_configs[0].address, "_0" => ip_configs[1].address }, - broadcasts: { default: ip_configs[0].broadcast, "_0" => nil }, - remote_ipaddrs: { default: nil, "_0" => ip_configs[1].remote_address }, - labels: { default: nil, "_0" => "my-label" } + ipaddrs: { "" => ip_configs[0].address, "_0" => ip_configs[1].address }, + broadcasts: { "" => ip_configs[0].broadcast, "_0" => nil }, + remote_ipaddrs: { "" => nil, "_0" => ip_configs[1].remote_address }, + labels: { "" => nil, "_0" => "my-label" } ) end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 1ea119c9e..5b080040b 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -59,7 +59,7 @@ def file_content(scr_root, file) describe "#ipaddrs" do it "returns the IP addresses" do expect(file.ipaddrs).to eq( - default: Y2Network::IPAddress.from_string("192.168.123.1/24") + "" => Y2Network::IPAddress.from_string("192.168.123.1/24") ) end @@ -152,7 +152,7 @@ def file_content(scr_root, file) describe "when multiple wireless keys are specified" do it "writes indexes keys" do - file.wireless_keys = { :default => "123456", "_1" => "abcdef" } + file.wireless_keys = { "" => "123456", "_1" => "abcdef" } file.save content = file_content(scr_root, file) From 5c9daa496e47df36c3a562c0cce6d3ff7d1aedd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2019 16:09:22 +0100 Subject: [PATCH 083/471] Fix documentation --- src/lib/y2network/ip_address.rb | 4 ++++ src/lib/y2network/sysconfig/connection_config_readers/base.rb | 2 +- src/lib/y2network/sysconfig/connection_config_writers/base.rb | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index c7d8451c0..a1a14ae99 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -36,6 +36,10 @@ module Y2Network # @example IPAddress behaviour # ip = IPAddress.new("192.168.122.1/24") # ip.to_s #=> "192.168.122.1/24" + # + # @example IPAddress with no prefix + # ip = IPAddress.new("192.168.122.1") + # ip.to_s #=> "192.168.122.1" class IPAddress extend Forwardable diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 9283a7927..5fa9d15bd 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -25,7 +25,7 @@ module Sysconfig module ConnectionConfigReaders # This is the base class for connection config readers. # - # The derived classes should implement {#connection_class} and {#add_connection_settings} + # The derived classes should implement {#connection_class} and {#update_connection_config} # methods. class Base # @return [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index 811996f1f..6e64e1dbe 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -22,6 +22,9 @@ module Y2Network module Sysconfig module ConnectionConfigWriters + # This is the base class for connection config writers. + # + # The derived classes should implement {#update_file} method. class Base # @return [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file attr_reader :file From a3b0aa9b51f965094cc3afe02f97b93b2a1c975c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 17:26:51 +0200 Subject: [PATCH 084/471] use constant with explanation --- src/modules/LanItems.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index a9d4e5e12..0a214b9c9 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1970,6 +1970,7 @@ def SetItem(builder:) nil end + PROPOSED_PPPOE_MTU = "1492" # suggested value for PPPoE # A default configuration for device when installer needs to configure it def ProposeItem(item_id) Builtins.y2milestone("Propose configuration for %1", GetDeviceName(item_id)) @@ -1978,7 +1979,7 @@ def ProposeItem(item_id) type = Items().fetch(item_id, {}).fetch("hwinfo", {})[type] builder = Y2Network::InterfaceConfigBuilder.for(type) - builder.mtu = "1492" if Arch.s390 && Builtins.contains(["lcs", "eth"], type) + builder.mtu = PROPOSED_PPPOE_MTU if Arch.s390 && Builtins.contains(["lcs", "eth"], type) builder.ip_address = "" builder.subnet_prefix = "" builder.boot_protocol = Y2Network::BootProtocol::DHCP From 0e0bf9f0dc240de00ddf9871ea53240bc42302b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 23 Jul 2019 16:31:21 +0100 Subject: [PATCH 085/471] Update from code review --- .../sysconfig/connection_config_readers/base.rb | 8 ++++---- .../sysconfig/connection_config_writers/base.rb | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 5fa9d15bd..0bf1a9b5a 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -25,7 +25,7 @@ module Sysconfig module ConnectionConfigReaders # This is the base class for connection config readers. # - # The derived classes should implement {#connection_class} and {#update_connection_config} + # The derived classes should implement {#update_connection_config} method. # methods. class Base # @return [Y2Network::Sysconfig::InterfaceFile] Interface's configuration file @@ -57,11 +57,10 @@ def connection_config # Returns the class of the connection configuration # - # @note This method should be redefined by derived classes. - # # @return [Class] def connection_class - raise NotImplementedError + self.class.to_s[/::([^:]+)$/, 1] + Y2Network::ConnectionConfig.const_get(class_name) end # Sets connection config settings from the given file @@ -89,6 +88,7 @@ def ip_configs broadcast: file.broadcasts[id] ) end + # The one without suffix comes first. configs.sort_by { |c| c.id.nil? ? -1 : 0 } end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index 6e64e1dbe..adcf88ee8 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -50,15 +50,6 @@ def write(conn) private - # Returns the class of the connection configuration - # - # @note This method should be redefined by derived classes. - # - # @return [Class] - def connection_class - raise NotImplementedError - end - # Sets file values from the given connection configuration # # @note This method should be redefined by derived classes. From 44c5380f88fcc1055bbad7f140bea844d23bfec7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 23 Jul 2019 18:31:37 +0200 Subject: [PATCH 086/471] make rubocop happy --- src/modules/LanItems.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 0a214b9c9..a9c776d46 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1970,7 +1970,7 @@ def SetItem(builder:) nil end - PROPOSED_PPPOE_MTU = "1492" # suggested value for PPPoE + PROPOSED_PPPOE_MTU = "1492".freeze # suggested value for PPPoE # A default configuration for device when installer needs to configure it def ProposeItem(item_id) Builtins.y2milestone("Propose configuration for %1", GetDeviceName(item_id)) From febfa52b320fb4c6c28a407fc17dc40dd906cc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 07:33:36 +0100 Subject: [PATCH 087/471] Update from code review --- .../y2network/sysconfig/connection_config_readers/base.rb | 4 +++- .../sysconfig/connection_config_readers/ethernet.rb | 6 ------ .../sysconfig/connection_config_readers/wireless.rb | 6 ------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 0bf1a9b5a..1b1d9edb3 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -19,6 +19,8 @@ require "y2network/connection_config/ip_config" require "y2network/ip_address" +require "y2network/boot_protocol" +require "y2network/startmode" module Y2Network module Sysconfig @@ -59,7 +61,7 @@ def connection_config # # @return [Class] def connection_class - self.class.to_s[/::([^:]+)$/, 1] + class_name = self.class.to_s.split("::").last Y2Network::ConnectionConfig.const_get(class_name) end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb index c44d9ae16..4791a904e 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb @@ -30,12 +30,6 @@ module ConnectionConfigReaders class Ethernet < Base private - # @return [Y2Network::ConnectionConfig::Ethernet] - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#connection_class - def connection_class - Y2Network::ConnectionConfig::Ethernet - end - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(_conn) end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 09749a93c..31e1273d7 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -30,12 +30,6 @@ module ConnectionConfigReaders class Wireless < Base private - # @return [Y2Network::ConnectionConfig::Ethernet] - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#connection_class - def connection_class - Y2Network::ConnectionConfig::Wireless - end - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.ap = file.wireless_ap From 3dcfca3d467c166f8ca9557699142f616f1f38f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 08:54:10 +0100 Subject: [PATCH 088/471] ConnectionConfigReaders::Base#connection_class requires the file --- src/lib/y2network/sysconfig/connection_config_readers/base.rb | 2 ++ .../y2network/sysconfig/connection_config_readers/ethernet.rb | 3 --- .../y2network/sysconfig/connection_config_readers/wireless.rb | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 1b1d9edb3..0ca8a35e3 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -62,6 +62,8 @@ def connection_config # @return [Class] def connection_class class_name = self.class.to_s.split("::").last + file_name = class_name.gsub(/(\w)([A-Z])/, "\\1_\\2").downcase + require "y2network/connection_config/#{file_name}" Y2Network::ConnectionConfig.const_get(class_name) end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb index 4791a904e..c7e4d3640 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb @@ -18,9 +18,6 @@ # find current contact information at www.suse.com. require "y2network/sysconfig/connection_config_readers/base" -require "y2network/connection_config/ethernet" -require "y2network/boot_protocol" -require "y2network/startmode" module Y2Network module Sysconfig diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 31e1273d7..159549dad 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -19,8 +19,6 @@ require "y2network/sysconfig/connection_config_readers/base" require "y2network/connection_config/wireless" -require "y2network/boot_protocol" -require "y2network/startmode" module Y2Network module Sysconfig From f0605204fbf2200c539f15be6d8374811f1eeb11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 08:55:04 +0100 Subject: [PATCH 089/471] Update from code review --- src/lib/y2network/connection_config/ip_config.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index e5b1d9b2e..f79f542df 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -27,7 +27,7 @@ class IPConfig attr_accessor :remote_address # @return [IPAddress,nil] Broadcast address attr_accessor :broadcast - # @return [String,nil] ID (needed for sysconfig backend in order to write suffixes in + # @return [String] ID (needed for sysconfig backend in order to write suffixes in attr_accessor :id # Constructor @@ -38,7 +38,7 @@ class IPConfig # @param label [String,nil] # @param remote_address [IPaddress,nil] # @param broadcast [IPaddress,nil] - def initialize(address, id: nil, label: nil, remote_address: nil, broadcast: nil) + def initialize(address, id: "", label: nil, remote_address: nil, broadcast: nil) @address = address @id = id @label = label From b6b152f4e7ec9cf7747d78f06294415fbea13adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 09:25:11 +0100 Subject: [PATCH 090/471] Drop unneeded line --- .../y2network/sysconfig/connection_config_readers/wireless.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 159549dad..2c4bbf64f 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -18,7 +18,6 @@ # find current contact information at www.suse.com. require "y2network/sysconfig/connection_config_readers/base" -require "y2network/connection_config/wireless" module Y2Network module Sysconfig From 874ab6428250bc226c7446747e2cc630f8228e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 24 Jul 2019 12:34:17 +0100 Subject: [PATCH 091/471] Added dummy connection config. --- src/lib/y2network/connection_config/base.rb | 4 +- src/lib/y2network/connection_config/dummy.rb | 28 ++++++ .../connection_config_readers/base.rb | 1 + .../connection_config_readers/dummy.rb | 31 +++++++ .../connection_config_writers/dummy.rb | 37 ++++++++ src/lib/y2network/sysconfig/interface_file.rb | 15 +++- .../etc/sysconfig/network/ifcfg-dummy0 | 3 + .../y2network/connection_config/dummy_test.rb | 32 +++++++ .../connection_config_readers/dummy_test.rb | 48 +++++++++++ .../connection_config_writers/dummy_test.rb | 85 +++++++++++++++++++ .../ethernet_test.rb | 1 + 11 files changed, 283 insertions(+), 2 deletions(-) create mode 100644 src/lib/y2network/connection_config/dummy.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/dummy.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/dummy.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-dummy0 create mode 100644 test/y2network/connection_config/dummy_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/dummy_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/dummy_test.rb diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 91332dee4..eae8f05e4 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -31,7 +31,9 @@ class Base # no specific interface then it could be activated by the first available # device. # - # #FIXME: Maybe it could be a matcher instead of an Interface, or just a + # @return [String] Connection name + attr_accessor :name + # #FIXME: Maybe it could be a matcher instead of an Interface or just # the interface name by now. # # @return [Interface, nil] diff --git a/src/lib/y2network/connection_config/dummy.rb b/src/lib/y2network/connection_config/dummy.rb new file mode 100644 index 000000000..505833b3e --- /dev/null +++ b/src/lib/y2network/connection_config/dummy.rb @@ -0,0 +1,28 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for dummy connections + class Dummy < Base + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 0ca8a35e3..4cc1f180d 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -49,6 +49,7 @@ def connection_config conn.description = file.name conn.interface = file.interface conn.ip_configs = ip_configs + conn.name = file.interface conn.startmode = Startmode.create(file.startmode || "manual") conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" update_connection_config(conn) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb b/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb new file mode 100644 index 000000000..b6fbd09fa --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/ethernet" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Dummy object given a + # Sysconfig::InterfaceFile object. + class Dummy < Ethernet + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb b/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb new file mode 100644 index 000000000..6cdd34b7d --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb @@ -0,0 +1,37 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Dummy + # object to the underlying system. + class Dummy < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(_conn) + file.interfacetype = "dummy" + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 4293a7e55..b9b67b0ae 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -20,6 +20,7 @@ require "yast" require "pathname" require "y2network/ip_address" +require "y2network/interface_type" module Y2Network module Sysconfig @@ -57,6 +58,7 @@ class << self # @param interface [String] Interface name # @return [Sysconfig::InterfaceFile,nil] Sysconfig def find(interface) + Yast.import "FileUtils" return nil unless Yast::FileUtils.Exists(SYSCONFIG_NETWORK_DIR.join("ifcfg-#{interface}").to_s) new(interface) end @@ -134,6 +136,10 @@ def variable_name(param_name) # @return [String] Interface's description (e.g., "Ethernet Card 0") define_variable(:name, :string) + # !@attribute [r] interfacetype + # @return [String] Forced Interface's type (e.g., "dummy") + define_variable(:interfacetype, :string) + # !@attribute [r] bootproto # return [String] Set up protocol (static, dhcp, dhcp4, dhcp6, autoip, dhcp+autoip, # auto6, 6to4, none) @@ -278,7 +284,14 @@ def save # # @return [String] Interface's type depending on the file values def type - "eth" + return InterfaceType::DUMMY if @values["INTERFACETYPE"] == "dummy" + return InterfaceType::BONDING if defined_variables.any? { |k| k.start_with?("BOND") } + return InterfaceType::BRIDGE if defined_variables.any? { |k| k.start_with?("BRIDGE") } + return InterfaceType::WIRELESS if defined_variables.any? { |k| k.start_with?("WIRELESS") } + return InterfaceType::VLAN if defined_variables.include? "ETHERDEVICE" + return InterfaceType::INFINIBAND if defined_variables.include? "IPOIB_MODE" + + InterfaceType::ETHERNET end # Empties all known values diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-dummy0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-dummy0 new file mode 100644 index 000000000..25659f827 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-dummy0 @@ -0,0 +1,3 @@ +INTERFACETYPE='dummy' +BOOTPROTO='static' +IPADDR='192.168.100.150/24' diff --git a/test/y2network/connection_config/dummy_test.rb b/test/y2network/connection_config/dummy_test.rb new file mode 100644 index 000000000..211c1689f --- /dev/null +++ b/test/y2network/connection_config/dummy_test.rb @@ -0,0 +1,32 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/dummy" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Dummy do + subject(:config) { described_class.new } + + describe "#type" do + it "returns 'dummy'" do + expect(config.type).to eq(Y2Network::InterfaceType::DUMMY) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/dummy_test.rb b/test/y2network/sysconfig/connection_config_readers/dummy_test.rb new file mode 100644 index 000000000..e9f6faeac --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/dummy_test.rb @@ -0,0 +1,48 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/dummy" +require "y2network/sysconfig/interface_file" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Dummy do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "dummy0" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + let(:ip_address) { Y2Network::IPAddress.from_string("192.168.100.150/24") } + + it "returns a dummy connection config object" do + dummy_conn = handler.connection_config + expect(dummy_conn.interface).to eq("dummy0") + expect(dummy_conn.ip_configs.map(&:address)).to eq([ip_address]) + expect(dummy_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb new file mode 100644 index 000000000..39f0cbd0f --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb @@ -0,0 +1,85 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/dummy" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/dummy" +require "y2network/connection_config/ip_config" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Dummy do + subject(:handler) { described_class.new(file) } + + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } + + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end + + let(:ip_configs) do + [ + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.100/24") + ) + ] + end + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Dummy, + name: "dummy1", + interface: "dummy1", + description: "", + bootproto: Y2Network::BootProtocol::STATIC, + ip_configs: ip_configs, + startmode: Y2Network::Startmode.create("auto") + ) + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "static", + startmode: "auto" + ) + end + + it "writes the interfacetype as 'dummy'" do + handler.write(conn) + expect(file).to have_attributes( + interfacetype: Y2Network::InterfaceType::DUMMY.short_name + ) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index e9c9774c8..46326f088 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -61,6 +61,7 @@ def file_content(scr_root, file) let(:conn) do instance_double( Y2Network::ConnectionConfig::Ethernet, + name: "eth0", interface: "eth0", description: "Ethernet Card 0", bootproto: Y2Network::BootProtocol::STATIC, From 81294e53c8c6ba7f885daffe4191ab3c511d5ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 13:08:13 +0100 Subject: [PATCH 092/471] Add a method to get the list of kernel modules for an interface --- src/lib/y2network/hwinfo.rb | 13 +++++++++++ test/data/hardware.yml | 30 +++++++++++++++++++++++++ test/y2network/hwinfo_test.rb | 41 +++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 test/data/hardware.yml create mode 100644 test/y2network/hwinfo_test.rb diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index 0913821dc..36a79d551 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -96,6 +96,19 @@ def description @hwinfo ? @hwinfo.fetch("name", "") : "" end + # Returns the list of kernel modules + # + # The list of modules is internally represented as: + # + # [[mod1name, mod1args], [mod2name, mod2args]] + # + # This method only returns the names, omitting the arguments. + # + # @return [Array] + def modules_names + drivers[0].fetch("modules", []).map(&:first) + end + private # for textdomain in network/hardware.rb diff --git a/test/data/hardware.yml b/test/data/hardware.yml new file mode 100644 index 000000000..4eb748f81 --- /dev/null +++ b/test/data/hardware.yml @@ -0,0 +1,30 @@ +--- +- name: Ethernet Card 0 + type: eth + udi: '' + sysfs_id: "/devices/pci0000:00/0000:00:02.0/0000:01:00.0/virtio0" + dev_name: enp1s0 + requires: [] + modalias: virtio:d00000001v00001AF4 + unique: Ds1o.VIRhsc57kTD + driver: virtio_net + num: 0 + drivers: + - active: true + modprobe: true + modules: + - - virtio_net + - '' + active: true + module: virtio_net + options: '' + bus: Virtio + busid: virtio0 + parent_busid: '0000:01:00.0' + mac: 52:54:00:68:54:fb + permanent_mac: 52:54:00:68:54:fb + link: true + wl_channels: + wl_bitrates: + wl_auth_modes: + wl_enc_modes: diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb new file mode 100644 index 000000000..a2737030c --- /dev/null +++ b/test/y2network/hwinfo_test.rb @@ -0,0 +1,41 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" +require "y2network/hwinfo" + +describe Y2Network::Hwinfo do + subject(:hwinfo) { described_class.new(name: interface_name) } + + let(:hardware) do + YAML.load_file(File.join(DATA_PATH, "hardware.yml")) + end + + let(:interface_name) { "enp1s0" } + + before do + allow(Yast::LanItems).to receive(:Hardware).and_return(hardware) + end + + describe "#modules_names" do + it "returns the list of kernel modules names" do + expect(hwinfo.modules_names).to eq(["virtio_net"]) + end + end +end From 8dbe0f6e48bcc87001e0dc03510f0a833de1411c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 14:49:27 +0100 Subject: [PATCH 093/471] Add Hwinfo#exists? tests --- test/y2network/hwinfo_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index a2737030c..daa0a946f 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -33,6 +33,22 @@ allow(Yast::LanItems).to receive(:Hardware).and_return(hardware) end + describe "#exists?" do + context "when the device exists" do + it "returns true" do + expect(hwinfo.exists?).to eq(true) + end + end + + context "when the device does not exist" do + let(:interface_name) { "missing" } + + it "returns false" do + expect(hwinfo.exists?).to eq(false) + end + end + end + describe "#modules_names" do it "returns the list of kernel modules names" do expect(hwinfo.modules_names).to eq(["virtio_net"]) From 35e0d55e9820bd49017552348ca7fe0cbc119214 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 24 Jul 2019 16:11:30 +0200 Subject: [PATCH 094/471] set more connection config attributes --- src/lib/y2network/interface_config_builder.rb | 57 ++++++++++++++++++- src/lib/y2network/ip_address.rb | 7 +++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 165f29816..12bde05a3 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -19,9 +19,11 @@ require "yast" require "y2network/connection_config/base" +require "y2network/connection_config/ip_config" require "y2network/hwinfo" require "y2network/startmode" require "y2network/boot_protocol" +require "y2network/ip_address" require "y2firewall/firewalld" require "y2firewall/firewalld/interface" @@ -58,12 +60,17 @@ def self.for(type) # # Load with reasonable defaults # @param type [Y2Network::InterfaceType] type of device - def initialize(type:) + # @param config [Y2Network::ConnectionConfig::Base] existing configuration of device or nil for + # newly created + def initialize(type:, config: nil) @type = type @config = init_device_config({}) @s390_config = init_device_s390_config({}) + # TODO: also config need to store it, as newly added can be later4 + # edited with option for not yet created interface + @newly_added = config.nil? # TODO: create specialized connection for type - @connection_config = ConnectionConfig::Base.new + @connection_config = config || ConnectionConfig::Base.new end def newly_added? @@ -148,6 +155,7 @@ def boot_protocol def boot_protocol=(value) value = value.name if value.is_a?(Y2Network::BootProtocol) @config["BOOTPROTO"] = value + @connection_config.bootproto = Y2Network::BootProtocol.from_name(value) end # @return [Startmode] @@ -232,6 +240,23 @@ def aliases # @param value [Array] see #aliases for hash values def aliases=(value) @aliases = value + + # connection config + # keep only default as aliases does not handle default ip config + @connection_config.ip_configs.delete_if { |c| c.id != "" } + value.each_with_index do |h, i| + ip_addr = IPAddress.from_string(h[:ip]) + if h[:prefixlen] && !h[:prefixlen].empty? + ip_addr.prefix = h[:prefixlen].delete("/").to_i + elsif h[:mask] && !h[:mask].empty? + ip.netmask = h[:mask] + end + @connection_config.ip_configs << ConnectionConfig::IPConfig.new( + ip_addr, + label: h[:label], + id: "_#{i}" # TODO: remember original prefixes + ) + end end # gets interface name that will be assigned by udev @@ -259,6 +284,14 @@ def ip_address # @param [String] value def ip_address=(value) @config["IPADDR"] = value + + # connection_config + if value.nil? || value.empty? + # in such case remove default config + @connection_config.ip_configs.delete_if { |c| c.id == "" } + else + ip_config_default.address.address = value + end end # @return [String] returns prefix or netmask. prefix in format "/" @@ -275,13 +308,21 @@ def subnet_prefix=(value) if value.empty? @config["PREFIXLEN"] = "" @config["NETMASK"] = "" + ip_config_default.address.prefix = nil elsif value.start_with?("/") @config["PREFIXLEN"] = value[1..-1] + ip_config_default.address.prefix = value[1..-1].to_i elsif value.size < 3 # one or two digits can be only prefixlen @config["PREFIXLEN"] = value + ip_config_default.address.prefix = value.to_i else param = Yast::Netmask.Check6(value) ? "PREFIXLEN" : "NETMASK" @config[param] = value + if param == "PREFIXLEN" + ip_config_default.address.prefix = value.to_i + else + ip_config_default.address.netmask = value + end end end @@ -304,6 +345,7 @@ def remote_ip # @param [String] value def remote_ip=(value) @config["REMOTEIP"] = value + ip_config_default.remote_address = IPAddress.from_string(value) end # Gets Maximum Transition Unit @@ -316,6 +358,8 @@ def mtu # @param [String] value def mtu=(value) @config["MTU"] = value + + @connection_config.mtu = value.to_i end # @return [Array(2)] user and group of tunnel @@ -475,5 +519,14 @@ def save_aliases Yast::NetworkInterfaces.DeleteAlias(Yast::NetworkInterfaces.Name, a) if v end end + + def ip_config_default + default = @connection_config.ip_configs.find { |c| c.id == "" } + if !default + default = ConnectionConfig::IPConfig.new(IPAddress.new("0.0.0.0")) # fake ip as it will be replaced soon + @connection_config.ip_configs << default + end + default + end end end diff --git a/src/lib/y2network/ip_address.rb b/src/lib/y2network/ip_address.rb index a1a14ae99..4b64ca2c6 100644 --- a/src/lib/y2network/ip_address.rb +++ b/src/lib/y2network/ip_address.rb @@ -80,6 +80,13 @@ def netmask=(netmask) self.prefix = IPAddr.new("#{netmask}/#{netmask}").prefix end + # Sets the address from the string + # + # @param value [String] String representation of the address + def address=(value) + @address = IPAddr.new(value) + end + # Determines whether two addresses are equivalent # # @param other [IPAddress] The address to compare with From c54536bb094c347e48853764705443ae2f8c2335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 15:17:04 +0100 Subject: [PATCH 095/471] Drop unused PhysicalInterface#hwinfo method --- src/lib/y2network/physical_interface.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/lib/y2network/physical_interface.rb b/src/lib/y2network/physical_interface.rb index 98e536ff8..b8cf9c90b 100644 --- a/src/lib/y2network/physical_interface.rb +++ b/src/lib/y2network/physical_interface.rb @@ -18,18 +18,11 @@ # find current contact information at www.suse.com. require "y2network/interface" -require "y2network/hwinfo" module Y2Network # Physical interface class (ethernet, wireless, infiniband...) class PhysicalInterface < Interface - attr_writer :hwinfo # @return [String] attr_accessor :ethtool_options - - # @return [Hwinfo] - def hwinfo - @hwinfo ||= Hwinfo.new({}) - end end end From 47f4dc86b4821cd66e6c6d6b52c5b01ec7634596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 15:22:35 +0100 Subject: [PATCH 096/471] Add Interface#modules_names method --- src/lib/y2network/interface.rb | 8 ++++++++ test/y2network/interface_test.rb | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 021c2e38d..1a252b57f 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -84,6 +84,14 @@ def config system_config(name) end + # Returns the list of kernel modules + # + # @return [Array] + # @see Hwinfo#modules_names + def modules_names + hardware.modules_names + end + private def system_config(name) diff --git a/test/y2network/interface_test.rb b/test/y2network/interface_test.rb index f8d3c92dd..72dc38894 100644 --- a/test/y2network/interface_test.rb +++ b/test/y2network/interface_test.rb @@ -41,4 +41,16 @@ end end end + + describe "#modules_names" do + let(:hwinfo) { instance_double(Y2Network::Hwinfo, modules_names: ["virtio_net"]) } + + before do + allow(interface).to receive(:hardware).and_return(hwinfo) + end + + it "returns modules names from hardware information" do + expect(interface.modules_names).to eq(["virtio_net"]) + end + end end From 98a929c43436e461be982d746837f668b57449cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 15:22:59 +0100 Subject: [PATCH 097/471] Minor documentation fix --- src/lib/y2network/interface.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 1a252b57f..bb01b9b4d 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -54,6 +54,7 @@ class Interface # Constructor # # @param name [String] Interface name (e.g., "eth0") + # @param type [InterfaceType] Interface type def initialize(name, type: InterfaceType::ETHERNET) @name = name @description = "" From 5cf14e8d1e6fcfe4193b4a5b2b0b498c2cd003ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 24 Jul 2019 15:09:01 +0100 Subject: [PATCH 098/471] Changes based on code review. --- .../y2network/sysconfig/connection_config_writers/dummy.rb | 2 ++ src/lib/y2network/sysconfig/interface_file.rb | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb b/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb index 6cdd34b7d..ff4b738ad 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb @@ -29,6 +29,8 @@ class Dummy < Base # @see Y2Network::ConnectionConfigWriters::Base#update_file def update_file(_conn) + # Force the interfacetype otherwise there is no way to infer the type + # from the file values (bsc#1129552) file.interfacetype = "dummy" end end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index b9b67b0ae..949ff7897 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -22,6 +22,8 @@ require "y2network/ip_address" require "y2network/interface_type" +Yast.import "FileUtils" + module Y2Network module Sysconfig # This class represents a sysconfig file containing an interface configuration @@ -58,7 +60,6 @@ class << self # @param interface [String] Interface name # @return [Sysconfig::InterfaceFile,nil] Sysconfig def find(interface) - Yast.import "FileUtils" return nil unless Yast::FileUtils.Exists(SYSCONFIG_NETWORK_DIR.join("ifcfg-#{interface}").to_s) new(interface) end @@ -282,7 +283,7 @@ def save # # @todo Borrow logic from https://github.com/yast/yast-yast2/blob/6f7a789d00cd03adf62e00da34720f326f0e0633/library/network/src/modules/NetworkInterfaces.rb#L291 # - # @return [String] Interface's type depending on the file values + # @return [Y2Network::InterfaceType] Interface's type depending on the file values def type return InterfaceType::DUMMY if @values["INTERFACETYPE"] == "dummy" return InterfaceType::BONDING if defined_variables.any? { |k| k.start_with?("BOND") } From 468030897d73b049ee92a44c368f26f17663c004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 24 Jul 2019 15:38:51 +0100 Subject: [PATCH 099/471] Fix InterfacesCollection tests --- src/lib/y2network/interfaces_collection.rb | 2 +- test/y2network/interfaces_collection_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index 3cb8bc2c7..c269adae7 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -66,7 +66,7 @@ def initialize(interfaces = []) # @return [Interface,nil] Interface with the given name or nil if not found def by_name(name) interfaces.find do |iface| - iface_name = iface.name || iface.hwinfo.name + iface_name = iface.name || iface.hardware.name iface_name == name end end diff --git a/test/y2network/interfaces_collection_test.rb b/test/y2network/interfaces_collection_test.rb index ce38219bd..2bc65ea7c 100644 --- a/test/y2network/interfaces_collection_test.rb +++ b/test/y2network/interfaces_collection_test.rb @@ -42,8 +42,8 @@ let(:eth0_hwinfo) { double("hwinfo", name: "eth0") } before do - allow(wlan0).to receive(:hwinfo).and_return(wlan0_hwinfo) - allow(eth0).to receive(:hwinfo).and_return(eth0_hwinfo) + allow(wlan0).to receive(:hardware).and_return(wlan0_hwinfo) + allow(eth0).to receive(:hardware).and_return(eth0_hwinfo) end it "returns the interface with the given name" do From 92efab0ae27a6ee05fca7017b2d6d2e05cc2904c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 24 Jul 2019 16:39:23 +0200 Subject: [PATCH 100/471] fix from review --- src/lib/y2network/interface_config_builder.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 12bde05a3..d0daa5d66 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -60,13 +60,13 @@ def self.for(type) # # Load with reasonable defaults # @param type [Y2Network::InterfaceType] type of device - # @param config [Y2Network::ConnectionConfig::Base] existing configuration of device or nil for - # newly created + # @param config [Y2Network::ConnectionConfig::Base, nil] existing configuration of device or nil + # for newly created def initialize(type:, config: nil) @type = type @config = init_device_config({}) @s390_config = init_device_s390_config({}) - # TODO: also config need to store it, as newly added can be later4 + # TODO: also config need to store it, as newly added can be later # edited with option for not yet created interface @newly_added = config.nil? # TODO: create specialized connection for type From 7e4db26cdacb3da98c3c4db055d9662f89afd582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 24 Jul 2019 14:53:34 +0100 Subject: [PATCH 101/471] Added infiniband connection config. --- .../y2network/connection_config/infiniband.rb | 37 +++++++++ .../connection_config_readers/infiniband.rb | 37 +++++++++ .../connection_config_writers/infiniband.rb | 37 +++++++++ src/lib/y2network/sysconfig/interface_file.rb | 6 ++ .../scr_read/etc/sysconfig/network/ifcfg-ib0 | 6 ++ .../infiniband_test.rb | 49 ++++++++++++ .../infiniband_test.rb | 78 +++++++++++++++++++ 7 files changed, 250 insertions(+) create mode 100644 src/lib/y2network/connection_config/infiniband.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-ib0 create mode 100644 test/y2network/sysconfig/connection_config_readers/infiniband_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/infiniband_test.rb diff --git a/src/lib/y2network/connection_config/infiniband.rb b/src/lib/y2network/connection_config/infiniband.rb new file mode 100644 index 000000000..cfa3466e7 --- /dev/null +++ b/src/lib/y2network/connection_config/infiniband.rb @@ -0,0 +1,37 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for infiniband connections + # + # @see https://www.kernel.org/doc/Documentation/infiniband/ipoib.txt + class Infiniband < Base + # @return [String] transport mode ("datagram" or "connected") + attr_accessor :ipoib_mode + + # Constructor + def initialize + @ipoib_mode = "" + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb b/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb new file mode 100644 index 000000000..c98a2e3c0 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb @@ -0,0 +1,37 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Infiniband object given a + # SysconfigInterfaceFile object. + class Infiniband < Base + private + + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(conn) + conn.ipoib_mode = file.ipoib_mode + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb b/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb new file mode 100644 index 000000000..a10697b89 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb @@ -0,0 +1,37 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Infiniband + # object to the underlying system. + class Infiniband < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(conn) + file.ipoib_mode = conn.ipoib_mode + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 949ff7897..ecbe4f4b7 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -238,6 +238,12 @@ def variable_name(param_name) # @return [String] Network ID define_variable(:wireless_nwid) + ## INFINIBAND + + # @!attribute [r] ipoib_mode + # @return [String] IPOIB mode ("connected" or "datagram") + define_variable(:ipoib_mode) + # Constructor # # @param interface [String] Interface interface diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-ib0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-ib0 new file mode 100644 index 000000000..dba4531c7 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-ib0 @@ -0,0 +1,6 @@ +BOOTPROTO=static +STARTMODE=auto +IPOIB_MODE=datagram +IPADDR=192.168.20.1 +NETMASK=255.255.255.0 +BROADCAST=192.168.20.255 diff --git a/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb new file mode 100644 index 000000000..e1bffce57 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb @@ -0,0 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/infiniband" +require "y2network/sysconfig/interface_file" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Infiniband do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "ib0" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + let(:ip_address) { Y2Network::IPAddress.from_string("192.168.20.1/24") } + + it "returns a infiniband connection config object" do + infiniband_conn = handler.connection_config + expect(infiniband_conn.interface).to eq("ib0") + expect(infiniband_conn.ipoib_mode).to eq("datagram") + expect(infiniband_conn.ip_configs.map(&:address)).to eq([ip_address]) + expect(infiniband_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb new file mode 100644 index 000000000..da36eec58 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb @@ -0,0 +1,78 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/infiniband" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/infiniband" +require "y2network/connection_config/ip_config" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Infiniband do + subject(:handler) { described_class.new(file) } + + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } + + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end + + let(:ip_configs) do + [ + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("192.168.20.1/24") + ) + ] + end + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Infiniband, + name: "ib0", + interface: "ib0", + description: "", + ipoib_mode: "datagram", + ip_configs: ip_configs, + startmode: Y2Network::Startmode.create("auto"), + bootproto: Y2Network::BootProtocol::STATIC + ) + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes the 'ipoib_mode' attribute" do + handler.write(conn) + expect(file).to have_attributes( + ipoib_mode: "datagram" + ) + end + end +end From 5497b564fadaca2149a39e915d9d595f666e6a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 24 Jul 2019 16:55:28 +0100 Subject: [PATCH 102/471] Added IpoibMode as suggested in CR. --- .../y2network/connection_config/infiniband.rb | 7 +-- src/lib/y2network/ipoib_mode.rb | 60 +++++++++++++++++++ .../connection_config_readers/infiniband.rb | 3 +- .../connection_config_writers/infiniband.rb | 2 +- .../infiniband_test.rb | 2 +- .../infiniband_test.rb | 5 +- 6 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 src/lib/y2network/ipoib_mode.rb diff --git a/src/lib/y2network/connection_config/infiniband.rb b/src/lib/y2network/connection_config/infiniband.rb index cfa3466e7..7e3ad1e85 100644 --- a/src/lib/y2network/connection_config/infiniband.rb +++ b/src/lib/y2network/connection_config/infiniband.rb @@ -25,13 +25,8 @@ module ConnectionConfig # # @see https://www.kernel.org/doc/Documentation/infiniband/ipoib.txt class Infiniband < Base - # @return [String] transport mode ("datagram" or "connected") + # @return [IpoibMode] transport mode attr_accessor :ipoib_mode - - # Constructor - def initialize - @ipoib_mode = "" - end end end end diff --git a/src/lib/y2network/ipoib_mode.rb b/src/lib/y2network/ipoib_mode.rb new file mode 100644 index 000000000..37d9728c2 --- /dev/null +++ b/src/lib/y2network/ipoib_mode.rb @@ -0,0 +1,60 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" + +module Y2Network + # This class represents the supported IPoIB transport modes. + class IpoibMode + class << self + # Returns all the existing modes + # + # @return [Array] + def all + @all ||= IpoibMode.constants + .map { |c| IpoibMode.const_get(c) } + .select { |c| c.is_a?(IpoibMode) } + end + + # Returns the transport mode with a given name + # + # @param name [String] + # @return [IpoibMode,nil] Ipoib mode or nil if not found + def from_name(name) + all.find { |t| t.name == name } + end + end + + # @return [String] Returns mode name + attr_reader :name + + # Constructor + # + # @param name [String] mode name + def initialize(name) + @name = name + end + + DATAGRAM = new("datagram") + CONNECTED = new("connected") + # Not a mode at all but the default value that will be choose by the IB + # driver (bnc#1086454) + DEFAULT = new("") + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb b/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb index c98a2e3c0..1ddfbeb3e 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "y2network/sysconfig/connection_config_readers/base" +require "y2network/ipoib_mode" module Y2Network module Sysconfig @@ -29,7 +30,7 @@ class Infiniband < Base # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) - conn.ipoib_mode = file.ipoib_mode + conn.ipoib_mode = IpoibMode.from_name(file.ipoib_mode.to_s) end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb b/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb index a10697b89..9dc18b74e 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb @@ -29,7 +29,7 @@ class Infiniband < Base # @see Y2Network::ConnectionConfigWriters::Base#update_file def update_file(conn) - file.ipoib_mode = conn.ipoib_mode + file.ipoib_mode = conn.ipoib_mode.name end end end diff --git a/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb index e1bffce57..3e4f52fcf 100644 --- a/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb @@ -41,7 +41,7 @@ it "returns a infiniband connection config object" do infiniband_conn = handler.connection_config expect(infiniband_conn.interface).to eq("ib0") - expect(infiniband_conn.ipoib_mode).to eq("datagram") + expect(infiniband_conn.ipoib_mode).to eq(Y2Network::IpoibMode::DATAGRAM) expect(infiniband_conn.ip_configs.map(&:address)).to eq([ip_address]) expect(infiniband_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) end diff --git a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb index da36eec58..ba2b9374a 100644 --- a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb @@ -22,6 +22,7 @@ require "y2network/sysconfig/connection_config_writers/infiniband" require "y2network/startmode" require "y2network/boot_protocol" +require "y2network/ipoib_mode" require "y2network/connection_config/infiniband" require "y2network/connection_config/ip_config" @@ -58,7 +59,7 @@ def file_content(scr_root, file) name: "ib0", interface: "ib0", description: "", - ipoib_mode: "datagram", + ipoib_mode: Y2Network::IpoibMode::CONNECTED, ip_configs: ip_configs, startmode: Y2Network::Startmode.create("auto"), bootproto: Y2Network::BootProtocol::STATIC @@ -71,7 +72,7 @@ def file_content(scr_root, file) it "writes the 'ipoib_mode' attribute" do handler.write(conn) expect(file).to have_attributes( - ipoib_mode: "datagram" + ipoib_mode: "connected" ) end end From aa2e014fd5f0979fea6b089f5160d563fd4d5321 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 25 Jul 2019 10:55:58 +0200 Subject: [PATCH 103/471] initial prototype of comparing backends --- src/lib/y2network/interface_config_builder.rb | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index d0daa5d66..f02f115b1 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -148,7 +148,10 @@ def firewall_zone=(value) # @return [Y2Network::BootProtocol] def boot_protocol - Y2Network::BootProtocol.from_name(@config["BOOTPROTO"]) + select_backend( + Y2Network::BootProtocol.from_name(@config["BOOTPROTO"]), + @connection_config.bootproto + ) end # @param[String, Y2Network::BootProtocol] @@ -165,7 +168,10 @@ def startmode return nil unless startmode startmode.priority = @config["IFPLUGD_PRIORITY"] if startmode.name == "ifplugd" - startmode + select_backend( + startmode, + @connection_config.startmode + ) end # @param [String,Y2Network::Startmode] name startmode name used to create Startmode object @@ -196,7 +202,11 @@ def ifplugd_priority=(value) # @return [Integer] def ifplugd_priority # in future use only @connection_config and just delegate method - @config["IFPLUGD_PRIORITY"].to_i + startmode = @connection_config.startmode + select_backend( + @config["IFPLUGD_PRIORITY"].to_i, + startmode.name == "ifplugd" ? startmode.priority : 0 + ) end # gets currently assigned kernel module @@ -528,5 +538,13 @@ def ip_config_default end default end + + # method that allows easy change of backend for providing data + # it also logs error if result differs + def select_backend(old, new) + log.error "Different value in backends. Old: #{old.inspect} New: #{new.inspect}" + + old + end end end From 7df8eb82498d9206f3df134f8f587447d1919d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 25 Jul 2019 11:36:51 +0100 Subject: [PATCH 104/471] Added vlan connection config. --- src/lib/y2network/connection_config/base.rb | 7 ++ src/lib/y2network/connection_config/vlan.rb | 51 +++++++++++++ .../connection_config_readers/vlan.rb | 38 ++++++++++ .../connection_config_writers/vlan.rb | 39 ++++++++++ src/lib/y2network/sysconfig/interface_file.rb | 10 +++ .../y2network/sysconfig/interfaces_reader.rb | 29 +++++-- src/lib/y2network/virtual_interface.rb | 9 +++ .../etc/sysconfig/network/ifcfg-eth0.100 | 5 ++ test/y2network/connection_config/vlan_test.rb | 32 ++++++++ .../connection_config_readers/vlan_test.rb | 47 ++++++++++++ .../connection_config_writers/vlan_test.rb | 75 +++++++++++++++++++ 11 files changed, 337 insertions(+), 5 deletions(-) create mode 100644 src/lib/y2network/connection_config/vlan.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/vlan.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/vlan.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.100 create mode 100644 test/y2network/connection_config/vlan_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/vlan_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/vlan_test.rb diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index eae8f05e4..33db6a71d 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -64,6 +64,13 @@ def type const_name = self.class.name.split("::").last.upcase InterfaceType.const_get(const_name) end + + # Whether a connection needs a virtual device associated or not. + # + # @return [Boolean] + def virtual? + false + end end end end diff --git a/src/lib/y2network/connection_config/vlan.rb b/src/lib/y2network/connection_config/vlan.rb new file mode 100644 index 000000000..5e7bf1b97 --- /dev/null +++ b/src/lib/y2network/connection_config/vlan.rb @@ -0,0 +1,51 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for vlan connections + class Vlan < Base + # @return [Interface, nil] + attr_accessor :etherdevice + # @return [Integer, nil] + attr_accessor :vlan_id + + # Replace the name of the etherdevice by a real Y2Network::Interface + # + # @see Y2Network::InterfacesCollection + # + # @param interfaces [Y2Network::InterfacesCollection] + def link_related_interfaces(interfaces) + return unless etherdevice + interface = interfaces.by_name(etherdevice) + self.etherdevice = interface if interface + end + + def related_interfaces + [etherdevice].compact + end + + def virtual? + true + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb b/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb new file mode 100644 index 000000000..93e5296d0 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/base" +require "y2network/connection_config/vlan" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Vlan object given a + # SysconfigInterfaceFile object. + class Vlan < Base + private + + def update_connection_config(conn) + conn.etherdevice = file.etherdevice + conn.vlan_id = file.vlan_id + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb b/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb new file mode 100644 index 000000000..70bc670a3 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb @@ -0,0 +1,39 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Vlan + # object to the underlying system. + class Vlan < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + # @param conn [Y2Network::ConnectionConfig::Vlan] Configuration to write + def update_file(conn) + file.vlan_id = conn.vlan_id + file.etherdevice = conn.etherdevice ? conn.etherdevice.name : nil + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index ecbe4f4b7..38c50aa35 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -244,6 +244,16 @@ def variable_name(param_name) # @return [String] IPOIB mode ("connected" or "datagram") define_variable(:ipoib_mode) + ## VLAN + + # !@attribute [r] etherdevice + # @return [String] Real device for the virtual LAN + define_variable(:etherdevice) + + # !@attribute [r] vlan_id + # @return [String] VLAN ID + define_variable(:vlan_id, :integer) + # Constructor # # @param interface [String] Interface interface diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 43bcaee0e..1ed92be7b 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -47,6 +47,8 @@ def config return @config if @config find_physical_interfaces find_connections + find_fake_interfaces + link_related_interfaces @config = { interfaces: @interfaces, connections: @connections } end @@ -67,6 +69,23 @@ def interfaces private + def link_related_interfaces + @connections.each do |conn| + next unless conn.respond_to? :related_interfaces + conn.link_related_interfaces(@interfaces) + end + end + + def find_fake_interfaces + @connections.each do |conn| + next unless conn.respond_to? :related_interfaces + conn.related_interfaces.each do |name| + next if @interfaces.by_name(name) + @interfaces << Y2Network::FakeInterface.new(name) + end + end + end + # Finds the physical interfaces # # Physical interfaces are read from the old LanItems module @@ -88,7 +107,7 @@ def find_connections interface ? interface.type : nil ) next unless connection - add_fake_interface(name, connection) if interface.nil? + add_interface(name, connection) if interface.nil? conns << connection end end @@ -129,7 +148,7 @@ def configured_devices files.reject { |f| IGNORE_IFCFG_REGEX =~ f || f == "lo" } end - # Adds a fake interface for a given connection + # Adds a fake or virtual interface for a given connection # # It may happen that a configured interface is not plugged # while reading the configuration. In such situations, a fake one @@ -138,9 +157,9 @@ def configured_devices # @param name [String] Interface name # @param conn [ConnectionConfig] Connection configuration related to the # network interface - def add_fake_interface(name, conn) - new_interface = Y2Network::FakeInterface.from_connection(name, conn) - @interfaces << new_interface + def add_interface(name, conn) + interface_class = conn.virtual? ? VirtualInterface : FakeInterface + @interfaces << interface_class.from_connection(name, conn) end end end diff --git a/src/lib/y2network/virtual_interface.rb b/src/lib/y2network/virtual_interface.rb index 899a1d2dd..f9bcecda0 100644 --- a/src/lib/y2network/virtual_interface.rb +++ b/src/lib/y2network/virtual_interface.rb @@ -22,5 +22,14 @@ module Y2Network # Virtual Interface Class (veth, bond, bridge, vlan, dummy...) class VirtualInterface < Interface + # Build connection + # + # @todo Would be possible to get the name from the connection? + # + # @param conn [ConnectionConfig] Connection configuration related to the + # network interface + def self.from_connection(name, conn) + new(name, type: conn.type) + end end end diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.100 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.100 new file mode 100644 index 000000000..ea9e7eea4 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.100 @@ -0,0 +1,5 @@ +BOOTPROTO='static' +IPADDR='192.168.100.20/24' +STARTMODE='auto' +VLAN_ID=100 +ETHERDEVICE=eth0 diff --git a/test/y2network/connection_config/vlan_test.rb b/test/y2network/connection_config/vlan_test.rb new file mode 100644 index 000000000..41b9db857 --- /dev/null +++ b/test/y2network/connection_config/vlan_test.rb @@ -0,0 +1,32 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/vlan" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Vlan do + subject(:config) { described_class.new } + + describe "#type" do + it "returns 'vlan'" do + expect(config.type).to eq(Y2Network::InterfaceType::VLAN) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/vlan_test.rb b/test/y2network/sysconfig/connection_config_readers/vlan_test.rb new file mode 100644 index 000000000..d37a94562 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/vlan_test.rb @@ -0,0 +1,47 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/vlan" +require "y2network/sysconfig/interface_file" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Vlan do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "eth0.100" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a vlan connection config object" do + vlan_conn = handler.connection_config + expect(vlan_conn.interface).to eq("eth0.100") + expect(vlan_conn.vlan_id).to eq(100) + expect(vlan_conn.etherdevice).to eq("eth0") + expect(vlan_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb new file mode 100644 index 000000000..ed2393048 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb @@ -0,0 +1,75 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/vlan" +require "y2network/fake_interface" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/vlan" +require "y2network/connection_config/ip_config" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Vlan do + subject(:handler) { described_class.new(file) } + + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } + + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end + + let(:eth0) { Y2Network::FakeInterface.new("eth0") } + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Vlan, + name: "eth0.100", + interface: "eth0.100", + description: "", + etherdevice: eth0, + vlan_id: 100, + ip_configs: [], + startmode: Y2Network::Startmode.create("auto"), + bootproto: Y2Network::BootProtocol::DHCP + ) + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes the 'etherdevice' and the 'vlan_id'" do + handler.write(conn) + expect(file).to have_attributes( + etherdevice: "eth0", + vlan_id: 100 + ) + end + end +end From 163d101a5927191efabe3c3a216ee7b7ad12f8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 25 Jul 2019 13:22:42 +0100 Subject: [PATCH 105/471] Use a class to represent kernel modules and options --- src/lib/y2network/driver.rb | 47 ++++++++++++++++++++++++++++++++ src/lib/y2network/hwinfo.rb | 10 ++++--- src/lib/y2network/interface.rb | 8 +++--- test/y2network/hwinfo_test.rb | 6 ++-- test/y2network/interface_test.rb | 5 ++-- 5 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 src/lib/y2network/driver.rb diff --git a/src/lib/y2network/driver.rb b/src/lib/y2network/driver.rb new file mode 100644 index 000000000..2654b1ddf --- /dev/null +++ b/src/lib/y2network/driver.rb @@ -0,0 +1,47 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +module Y2Network + # This class represents a driver for an interface + # + # It is composed of a kernel module name and a string representing the module options + class Driver + # @return [String] Kernel module name + attr_accessor :name + # @return [String] Kernel module parameters + attr_accessor :params + + def initialize(name, params = "") + @name = name + @params = params + end + + # Determines whether two interfaces are equal + # + # @param other [Driver] Driver to compare with + # @return [Boolean] + def ==(other) + name == other.name && params == other.params + end + + # eql? (hash key equality) should alias ==, see also + # https://ruby-doc.org/core-2.3.3/Object.html#method-i-eql-3F + alias_method :eql?, :== + end +end diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index 36a79d551..dff3a9da2 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "yast" +require "y2network/driver" module Y2Network # Stores useful (from networking POV) items of hwinfo for an interface @@ -69,7 +70,6 @@ def initialize(name:) { name: "busid", default: "" }, { name: "link", default: false }, { name: "driver", default: "" }, - { name: "drivers", default: [] }, { name: "module", default: nil }, { name: "requires", default: [] }, { name: "hotplug", default: false }, @@ -104,9 +104,11 @@ def description # # This method only returns the names, omitting the arguments. # - # @return [Array] - def modules_names - drivers[0].fetch("modules", []).map(&:first) + # @return [Array] List of drivers + def drivers + drivers_list = @hwinfo.fetch("drivers", []) + modules = drivers_list[0].fetch("modules", []) + modules.map { |m| Driver.new(*m) } end private diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index bb01b9b4d..4ed72d4c0 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -87,10 +87,10 @@ def config # Returns the list of kernel modules # - # @return [Array] - # @see Hwinfo#modules_names - def modules_names - hardware.modules_names + # @return [Array] + # @see Hwinfo#drivers + def drivers + hardware.drivers end private diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index daa0a946f..18d779eaa 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -49,9 +49,11 @@ end end - describe "#modules_names" do + describe "#drivers" do it "returns the list of kernel modules names" do - expect(hwinfo.modules_names).to eq(["virtio_net"]) + expect(hwinfo.drivers).to eq([ + Y2Network::Driver.new("virtio_net", "") + ]) end end end diff --git a/test/y2network/interface_test.rb b/test/y2network/interface_test.rb index 72dc38894..62c3d90db 100644 --- a/test/y2network/interface_test.rb +++ b/test/y2network/interface_test.rb @@ -43,14 +43,15 @@ end describe "#modules_names" do - let(:hwinfo) { instance_double(Y2Network::Hwinfo, modules_names: ["virtio_net"]) } + let(:driver) { instance_double(Y2Network::Driver) } + let(:hwinfo) { instance_double(Y2Network::Hwinfo, drivers: [driver]) } before do allow(interface).to receive(:hardware).and_return(hwinfo) end it "returns modules names from hardware information" do - expect(interface.modules_names).to eq(["virtio_net"]) + expect(interface.drivers).to eq([driver]) end end end From 3d0b163baadf2721014db64a128bd7222a6b7272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 25 Jul 2019 13:33:05 +0100 Subject: [PATCH 106/471] Make RuboCop --- test/y2network/hwinfo_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 18d779eaa..985c2d4d9 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -51,9 +51,9 @@ describe "#drivers" do it "returns the list of kernel modules names" do - expect(hwinfo.drivers).to eq([ - Y2Network::Driver.new("virtio_net", "") - ]) + expect(hwinfo.drivers).to eq( + [Y2Network::Driver.new("virtio_net", "")] + ) end end end From 117f4cd106aa312698b758863bba0d42b9594232 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 25 Jul 2019 14:37:36 +0200 Subject: [PATCH 107/471] more methods prepared for different backends testing --- src/lib/y2network/interface_config_builder.rb | 48 +++++++++++++++++-- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index f02f115b1..699bc57df 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -236,7 +236,9 @@ def driver_options=(value) # `:ip` for ip address, `:mask` for netmask and `:prefixlen` for prefix. # Only one of `:mask` and `:prefixlen` is set. def aliases - @aliases ||= Yast::LanItems.aliases.each_value.map do |data| + return @aliases if @aliases + + old_aliases = Yast::LanItems.aliases.each_value.map do |data| { label: data["LABEL"] || "", ip: data["IPADDR"] || "", @@ -244,6 +246,16 @@ def aliases prefixlen: data["PREFIXLEN"] || "" } end + + new_aliases = @connection_config.ip_configs.select{ |c| c.id != "" }.map do |data| + { + label: data.label + ip: data.address.address + prefixlen: data.address.prefix + # NOTE: new API does not have netmask at all, we need to adapt UI to clearly mention only prefix + } + end + select_backend(old_aliases, new_aliases) end # sets aliases for interface @@ -288,7 +300,15 @@ def ethtool_options=(value) # @return [String] def ip_address - @config["IPADDR"] + old = @config["IPADDR"] + + default = @connection_config.ip_configs.find{ |c| c.id == "" } + new_ = if default + default.address.address + else + "" + end + select_backend(old, new_) end # @param [String] value @@ -306,11 +326,18 @@ def ip_address=(value) # @return [String] returns prefix or netmask. prefix in format "/" def subnet_prefix - if @config["PREFIXLEN"] && !@config["PREFIXLEN"].empty? + old = if @config["PREFIXLEN"] && !@config["PREFIXLEN"].empty? "/#{@config["PREFIXLEN"]}" else @config["NETMASK"] || "" end + default = @connection_config.ip_configs.find{ |c| c.id == "" } + new_ = if default + "/" + default.address.prefix.to_s + else + "" + end + select_backend(old, new_) end # @param [String] value prefix or netmask is accepted. prefix in format "/" @@ -349,7 +376,15 @@ def hostname=(value) # sets remote ip for ptp connections # @return [String] def remote_ip - @config["REMOTEIP"] + old = @config["REMOTEIP"] + default = @connection_config.ip_configs.find{ |c| c.id == "" } + new_ = if default + default.remote_address.to_s + else + "" + end + + select_backend(old, new_) end # @param [String] value @@ -361,7 +396,10 @@ def remote_ip=(value) # Gets Maximum Transition Unit # @return [String] def mtu - @config["MTU"] + select_backend( + @config["MTU"], + @connection_config.mtu.to_s + ) end # Sets Maximum Transition Unit From 1650041623de2c6431e013a8918efaceb6f0e73f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 25 Jul 2019 16:34:08 +0200 Subject: [PATCH 108/471] pass connection config to builder --- src/include/network/lan/cmdline.rb | 5 ++++- src/include/network/lan/complex.rb | 12 +++++++---- src/lib/y2network/interface_config_builder.rb | 20 ++++++++++--------- .../interface_config_builders/bonding.rb | 4 ++-- .../interface_config_builders/bridge.rb | 4 ++-- .../interface_config_builders/dummy.rb | 4 ++-- .../interface_config_builders/infiniband.rb | 4 ++-- .../interface_config_builders/vlan.rb | 4 ++-- test/cmdline_test.rb | 4 ++++ 9 files changed, 37 insertions(+), 24 deletions(-) diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index 4a4d481f7..5659212d5 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -213,7 +213,10 @@ def EditHandler(options) return false if validateId(options, config) == false LanItems.current = getItem(options, config) - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType()) + + config = Lan.yast_config.copy + connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) builder.name = LanItems.GetCurrentName() LanItems.SetItem(builder: builder) update_builder_from_options!(builder, options) diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index fec4f28bc..8c4ec76c5 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -306,12 +306,15 @@ def enableDisableButtons # Automatically configures slaves when user enslaves them into a bond or bridge device def UpdateSlaves current = LanItems.current - master_builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType()) + config = Lan.yast_config.copy + connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + master_builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) master_builder.name = LanItems.GetCurrentName() Lan.autoconf_slaves.each do |dev| if LanItems.FindAndSelect(dev) - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType()) + connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) builder.name = LanItems.GetCurrentName() LanItems.SetItem(builder: builder) else @@ -407,8 +410,9 @@ def handleOverview(_key, event) return :redraw when :edit if LanItems.IsCurrentConfigured - - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType()) + config = Lan.yast_config.copy + connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) builder.name = LanItems.GetCurrentName() LanItems.SetItem(builder: builder) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 699bc57df..cabbb68f4 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -40,15 +40,17 @@ class InterfaceConfigBuilder # Load fresh instance of interface config builder for given type. # It can be specialized type or generic, depending if specialized is needed. # @param type [Y2Network::InterfaceType,String] type of device or its short name - def self.for(type) + # @param config [Y2Network::ConnectionConfig::Base, nil] existing configuration of device or nil + # for newly created + def self.for(type, config: nil) if !type.is_a?(InterfaceType) type = InterfaceType.from_short_name(type) or raise "Unknown type #{type.inspect}" end require "y2network/interface_config_builders/#{type.file_name}" - InterfaceConfigBuilders.const_get(type.class_name).new + InterfaceConfigBuilders.const_get(type.class_name).new(config: config) rescue LoadError => e log.info "Specialed builder for #{type} not found. Fallbacking to default. #{e.inspect}" - new(type: type) + new(type: type, config: config) end # @return [String] Device name (eth0, wlan0, etc.) @@ -247,10 +249,10 @@ def aliases } end - new_aliases = @connection_config.ip_configs.select{ |c| c.id != "" }.map do |data| + new_aliases = @connection_config.ip_configs.select { |c| c.id != "" }.map do |data| { - label: data.label - ip: data.address.address + label: data.label, + ip: data.address.address, prefixlen: data.address.prefix # NOTE: new API does not have netmask at all, we need to adapt UI to clearly mention only prefix } @@ -302,7 +304,7 @@ def ethtool_options=(value) def ip_address old = @config["IPADDR"] - default = @connection_config.ip_configs.find{ |c| c.id == "" } + default = @connection_config.ip_configs.find { |c| c.id == "" } new_ = if default default.address.address else @@ -331,7 +333,7 @@ def subnet_prefix else @config["NETMASK"] || "" end - default = @connection_config.ip_configs.find{ |c| c.id == "" } + default = @connection_config.ip_configs.find { |c| c.id == "" } new_ = if default "/" + default.address.prefix.to_s else @@ -377,7 +379,7 @@ def hostname=(value) # @return [String] def remote_ip old = @config["REMOTEIP"] - default = @connection_config.ip_configs.find{ |c| c.id == "" } + default = @connection_config.ip_configs.find { |c| c.id == "" } new_ = if default default.remote_address.to_s else diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index afd4533fe..35a996405 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -7,8 +7,8 @@ module InterfaceConfigBuilders class Bonding < InterfaceConfigBuilder include Yast::Logger - def initialize - super(type: InterfaceType::BONDING) + def initialize(config: nil) + super(type: InterfaceType::BONDING, config: config) # fill mandatory bond option @slaves = [] diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index d35b44ecd..ca4ca0a67 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -9,8 +9,8 @@ module InterfaceConfigBuilders class Bridge < InterfaceConfigBuilder include Yast::Logger - def initialize - super(type: InterfaceType::BRIDGE) + def initialize(config: nil) + super(type: InterfaceType::BRIDGE, config: config) end # Checks if any of given device is already configured and need adaptation for bridge diff --git a/src/lib/y2network/interface_config_builders/dummy.rb b/src/lib/y2network/interface_config_builders/dummy.rb index 97b65c8a9..323e0d9b4 100644 --- a/src/lib/y2network/interface_config_builders/dummy.rb +++ b/src/lib/y2network/interface_config_builders/dummy.rb @@ -4,8 +4,8 @@ module Y2Network module InterfaceConfigBuilders class Dummy < InterfaceConfigBuilder - def initialize - super(type: InterfaceType::DUMMY) + def initialize(config: nil) + super(type: InterfaceType::DUMMY, config: config) end # (see Y2Network::InterfaceConfigBuilder#save) diff --git a/src/lib/y2network/interface_config_builders/infiniband.rb b/src/lib/y2network/interface_config_builders/infiniband.rb index 209b7a859..a1a147b8a 100644 --- a/src/lib/y2network/interface_config_builders/infiniband.rb +++ b/src/lib/y2network/interface_config_builders/infiniband.rb @@ -6,8 +6,8 @@ module Y2Network module InterfaceConfigBuilders class Infiniband < InterfaceConfigBuilder - def initialize - super(type: InterfaceType::INFINIBAND) + def initialize(config: nil) + super(type: InterfaceType::INFINIBAND, config: config) end # @return [String] ipoib mode configuration diff --git a/src/lib/y2network/interface_config_builders/vlan.rb b/src/lib/y2network/interface_config_builders/vlan.rb index 4da1a39fd..e5285b783 100644 --- a/src/lib/y2network/interface_config_builders/vlan.rb +++ b/src/lib/y2network/interface_config_builders/vlan.rb @@ -7,8 +7,8 @@ module Y2Network module InterfaceConfigBuilders class Vlan < InterfaceConfigBuilder - def initialize - super(type: InterfaceType::VLAN) + def initialize(config: nil) + super(type: InterfaceType::VLAN, config: config) end # @return [Integer] diff --git a/test/cmdline_test.rb b/test/cmdline_test.rb index b340e43c0..6bec86e99 100644 --- a/test/cmdline_test.rb +++ b/test/cmdline_test.rb @@ -11,6 +11,10 @@ def initialize describe "NetworkLanCmdlineInclude" do subject { DummyClass.new } + before do + allow(Yast::Lan).to receive(:yast_config).and_return(Y2Network::Config.new(source: :fake)) + end + describe "#ShowHandler" do it "creates plain text from formatted html" do richtext = "test
  • item1
  • item2
" From 85e5be6666aaf2311bf69442ebf97f3e2f4550ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 25 Jul 2019 17:09:26 +0100 Subject: [PATCH 109/471] Add some clarification about Interface class role --- src/lib/y2network/connection_config/base.rb | 6 +++--- src/lib/y2network/interface.rb | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 91332dee4..45e26c74f 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -23,9 +23,9 @@ module Y2Network module ConnectionConfig # This class is reponsible of a connection configuration # - # It holds a configuration (IP addresses, MTU, etc.) that can be applied to an interface. By - # comparison, it is the equivalent of the "Connection" concept in NetworkManager. When it comes - # to sysconfig, a "ConnectionConfig" is defined using a "ifcfg-*" file. + # It holds a configuration (IP addresses, MTU, WIFI settings, etc.) that can be applied to an + # interface. By comparison, it is the equivalent of the "Connection" concept in NetworkManager. + # When it comes to sysconfig, a "ConnectionConfig" is defined using a "ifcfg-*" file. class Base # A connection could belongs to a specific interface or not. In case of # no specific interface then it could be activated by the first available diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 021c2e38d..90aaf4b2e 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -22,6 +22,17 @@ module Y2Network # Network interface. + # + # It represents network interfaces, no matter whether they are physical or virtual ones. This + # class (including its subclasses) are basically responsible for holding the hardware + # configuration (see {Hwinfo}), including naming and driver information. + # + # Logical configuration, like TCP/IP or WIFI settings, are handled through + # Y2Network::ConnectionConfig::Base classes. + # + # @see Y2Network::PhysicalInterface + # @see Y2Network::VirtualInterface + # @see Y2Network::FakeInterface class Interface # @return [String] Device name ('eth0', 'wlan0', etc.) attr_accessor :name @@ -36,7 +47,7 @@ class Interface # Shortcuts for accessing interfaces' ifcfg options # - # TODO: this makes Interface class tighly couplet to netconfig backend + # TODO: this makes Interface class tighly coupled with netconfig (sysconfig) backend # once we have generic layer for accessing backends these methods has to be replaced ["STARTMODE", "BOOTPROTO"].each do |ifcfg_option| method_name = ifcfg_option.downcase From 7ff5e5f627618d212bf2d56cfcb7350c034006f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 25 Jul 2019 17:22:48 +0100 Subject: [PATCH 110/471] Fix InterfaceConfigBuilder description --- src/lib/y2network/interface_config_builder.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 165f29816..0055f4b1f 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -30,8 +30,10 @@ Yast.import "Netmask" module Y2Network - # Collects data from the UI until we have enough of it to create a {Y2Network::Interface}. - # {Yast::LanItemsClass#Commit Yast::LanItems.Commit(builder)} uses it. + # Collects data from the UI until we have enough of it to create a + # {Y2Network::ConnectionConfig::Base} object. + # + # {Yast::LanItemsClass#Commit Yast::LanItems.Commit(builder)} use it. class InterfaceConfigBuilder include Yast::Logger From c96bb5d6dadc0204915ce78d9f2301b2d5f9e877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 25 Jul 2019 17:25:59 +0100 Subject: [PATCH 111/471] Do not use objects for vlan parent and connection interface --- src/lib/y2network/connection_config/base.rb | 6 ++--- src/lib/y2network/connection_config/vlan.rb | 23 +++++-------------- .../connection_config_readers/vlan.rb | 2 +- .../connection_config_writers/vlan.rb | 2 +- .../y2network/sysconfig/interfaces_reader.rb | 19 --------------- .../connection_config_readers/vlan_test.rb | 2 +- .../connection_config_writers/vlan_test.rb | 20 ++++++++-------- .../sysconfig/interfaces_reader_test.rb | 16 ++++++++++--- 8 files changed, 34 insertions(+), 56 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 33db6a71d..2216d7106 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -33,10 +33,10 @@ class Base # # @return [String] Connection name attr_accessor :name - # #FIXME: Maybe it could be a matcher instead of an Interface or just - # the interface name by now. + # #FIXME: Maybe in the future it could be a matcher. By now we will use + # the interface name # - # @return [Interface, nil] + # @return [String, nil] attr_accessor :interface # @return [BootProtocol] Bootproto attr_accessor :bootproto diff --git a/src/lib/y2network/connection_config/vlan.rb b/src/lib/y2network/connection_config/vlan.rb index 5e7bf1b97..dbad8146e 100644 --- a/src/lib/y2network/connection_config/vlan.rb +++ b/src/lib/y2network/connection_config/vlan.rb @@ -23,26 +23,15 @@ module Y2Network module ConnectionConfig # Configuration for vlan connections class Vlan < Base - # @return [Interface, nil] - attr_accessor :etherdevice + # FIXME: By now it will be just the interface name although in NM it + # could be a ifname, UUID or even a MAC address. + # + # @return [String] the real interface associated with the vlan + attr_accessor :parent_device # @return [Integer, nil] attr_accessor :vlan_id - # Replace the name of the etherdevice by a real Y2Network::Interface - # - # @see Y2Network::InterfacesCollection - # - # @param interfaces [Y2Network::InterfacesCollection] - def link_related_interfaces(interfaces) - return unless etherdevice - interface = interfaces.by_name(etherdevice) - self.etherdevice = interface if interface - end - - def related_interfaces - [etherdevice].compact - end - + # @see Y2Network::ConnectionConfig::Base#virtual? def virtual? true end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb b/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb index 93e5296d0..804d6f351 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb @@ -29,7 +29,7 @@ class Vlan < Base private def update_connection_config(conn) - conn.etherdevice = file.etherdevice + conn.parent_device = file.etherdevice conn.vlan_id = file.vlan_id end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb b/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb index 70bc670a3..fc1502625 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb @@ -31,7 +31,7 @@ class Vlan < Base # @param conn [Y2Network::ConnectionConfig::Vlan] Configuration to write def update_file(conn) file.vlan_id = conn.vlan_id - file.etherdevice = conn.etherdevice ? conn.etherdevice.name : nil + file.etherdevice = conn.parent_device end end end diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 1ed92be7b..22fc1d5c5 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -47,8 +47,6 @@ def config return @config if @config find_physical_interfaces find_connections - find_fake_interfaces - link_related_interfaces @config = { interfaces: @interfaces, connections: @connections } end @@ -69,23 +67,6 @@ def interfaces private - def link_related_interfaces - @connections.each do |conn| - next unless conn.respond_to? :related_interfaces - conn.link_related_interfaces(@interfaces) - end - end - - def find_fake_interfaces - @connections.each do |conn| - next unless conn.respond_to? :related_interfaces - conn.related_interfaces.each do |name| - next if @interfaces.by_name(name) - @interfaces << Y2Network::FakeInterface.new(name) - end - end - end - # Finds the physical interfaces # # Physical interfaces are read from the old LanItems module diff --git a/test/y2network/sysconfig/connection_config_readers/vlan_test.rb b/test/y2network/sysconfig/connection_config_readers/vlan_test.rb index d37a94562..c535f4ea4 100644 --- a/test/y2network/sysconfig/connection_config_readers/vlan_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/vlan_test.rb @@ -40,7 +40,7 @@ vlan_conn = handler.connection_config expect(vlan_conn.interface).to eq("eth0.100") expect(vlan_conn.vlan_id).to eq(100) - expect(vlan_conn.etherdevice).to eq("eth0") + expect(vlan_conn.parent_device).to eq("eth0") expect(vlan_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) end end diff --git a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb index ed2393048..8ac210886 100644 --- a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb @@ -45,26 +45,24 @@ def file_content(scr_root, file) end end - let(:eth0) { Y2Network::FakeInterface.new("eth0") } - let(:conn) do instance_double( Y2Network::ConnectionConfig::Vlan, - name: "eth0.100", - interface: "eth0.100", - description: "", - etherdevice: eth0, - vlan_id: 100, - ip_configs: [], - startmode: Y2Network::Startmode.create("auto"), - bootproto: Y2Network::BootProtocol::DHCP + name: "eth0.100", + interface: "eth0.100", + description: "", + parent_device: "eth0", + vlan_id: 100, + ip_configs: [], + startmode: Y2Network::Startmode.create("auto"), + bootproto: Y2Network::BootProtocol::DHCP ) end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } describe "#write" do - it "writes the 'etherdevice' and the 'vlan_id'" do + it "writes the 'etherdevice' and the 'vlan_id' attributes" do handler.write(conn) expect(file).to have_attributes( etherdevice: "eth0", diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index 8d7f18d9f..15b1e23b2 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -60,9 +60,19 @@ context "when a connection for a not existing device is found" do let(:configured_interfaces) { ["lo", "eth0", "eth1"] } - it "creates a fake interface" do - eth1 = reader.interfaces.by_name("eth1") - expect(eth1).to_not be_nil + context "and it is a virtual connection" do + it "creates a virtual interface" do + vlan = reader.interfaces.by_name("eth0.100") + expect(vlan).to_not be_nil + expect(vlan).to be_a Y2Network::VirtualInterface + end + end + + context "and it is not a virtual connection" do + it "creates a fake interface" do + eth1 = reader.interfaces.by_name("eth1") + expect(eth1).to be_a Y2Network::FakeInterface + end end end end From 4f83057b840c913e14fc5c04808ca27d33d17a85 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 26 Jul 2019 08:30:56 +0200 Subject: [PATCH 112/471] fixes found during manual testing --- src/include/network/lan/complex.rb | 4 ++++ src/lib/y2network/interface_config_builder.rb | 3 ++- src/lib/y2network/sysconfig/connection_config_readers/base.rb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index 8c4ec76c5..2f3385c5a 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -305,9 +305,13 @@ def enableDisableButtons # Automatically configures slaves when user enslaves them into a bond or bridge device def UpdateSlaves + # TODO: sometimes it is called when no device is selected and then it crashes + return if LanItems.GetCurrentName.nil? || LanItems.GetCurrentName.empty? + current = LanItems.current config = Lan.yast_config.copy connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + Yast.y2milestone("update slaves for #{current}:#{LanItems.GetCurrentName}:#{LanItems.GetCurrentType}") master_builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) master_builder.name = LanItems.GetCurrentName() diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index cabbb68f4..bd66c5927 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -581,8 +581,9 @@ def ip_config_default # method that allows easy change of backend for providing data # it also logs error if result differs + # TODO: Only temporary method for testing switch of backends. Remove it from production def select_backend(old, new) - log.error "Different value in backends. Old: #{old.inspect} New: #{new.inspect}" + log.error "Different value in backends. Old: #{old.inspect} New: #{new.inspect}" if new != old old end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 4cc1f180d..ce5b35341 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -94,7 +94,7 @@ def ip_configs ) end # The one without suffix comes first. - configs.sort_by { |c| c.id.nil? ? -1 : 0 } + configs.compact.sort_by { |c| c.id.nil? ? -1 : 0 } end # Builds an IP address From 8081c819d95febca40cfbc77bd08d95cd0cd664d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 26 Jul 2019 12:05:31 +0100 Subject: [PATCH 113/471] Add a note about bonding slaves --- src/lib/y2network/interface.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 90aaf4b2e..8df7fbef4 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -28,7 +28,8 @@ module Y2Network # configuration (see {Hwinfo}), including naming and driver information. # # Logical configuration, like TCP/IP or WIFI settings, are handled through - # Y2Network::ConnectionConfig::Base classes. + # Y2Network::ConnectionConfig::Base classes. Actually, relationships with other interfaces (like + # bonding slaves) are kept in those configuration objects too. # # @see Y2Network::PhysicalInterface # @see Y2Network::VirtualInterface From babefb28148ab955e7b37185b8983e79915ae69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 29 Jul 2019 15:32:08 +0100 Subject: [PATCH 114/471] Added bridge connection config --- src/lib/y2network/connection_config/bridge.rb | 46 ++++++++++ .../connection_config_readers/bridge.rb | 39 +++++++++ .../connection_config_writers/bridge.rb | 42 ++++++++++ src/lib/y2network/sysconfig/interface_file.rb | 22 ++++- .../scr_read/etc/sysconfig/network/ifcfg-br0 | 6 ++ .../connection_config_readers/bridge_test.rb | 47 +++++++++++ .../connection_config_writers/bridge_test.rb | 84 +++++++++++++++++++ 7 files changed, 284 insertions(+), 2 deletions(-) create mode 100644 src/lib/y2network/connection_config/bridge.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/bridge.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/bridge.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-br0 create mode 100644 test/y2network/sysconfig/connection_config_readers/bridge_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/bridge_test.rb diff --git a/src/lib/y2network/connection_config/bridge.rb b/src/lib/y2network/connection_config/bridge.rb new file mode 100644 index 000000000..75d2f5827 --- /dev/null +++ b/src/lib/y2network/connection_config/bridge.rb @@ -0,0 +1,46 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for bridge connections + # + # @see https://www.kernel.org/doc/Documentation/networking/bridge.txt + class Bridge < Base + # @return [Array] + attr_accessor :ports + # @return [Boolean] whether spanning tree protocol is enabled or not + attr_accessor :stp + # @return [Integer] + attr_accessor :forward_delay + + def initialize + @ports = [] + @stp = false + @forward_delay = 0 + end + + def virtual? + true + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb b/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb new file mode 100644 index 000000000..827e2d838 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb @@ -0,0 +1,39 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Bridge object given a + # SysconfigInterfaceFile object. + class Bridge < Base + private + + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(conn) + conn.ports = file.bridge_ports.split(" ") + conn.stp = file.bridge_stp + conn.forward_delay = file.bridge_forwarddelay + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/bridge.rb b/src/lib/y2network/sysconfig/connection_config_writers/bridge.rb new file mode 100644 index 000000000..37b41dd8d --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/bridge.rb @@ -0,0 +1,42 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a + # ConnectionConfig::Bridge object to the underlying system. + class Bridge < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + # @param conn [Y2Network::ConnectionConfig::Bridge] Configuration to + # write + def update_file(conn) + file.bridge = "yes" + file.bridge_ports = conn.ports.join(" ") + file.bridge_forwarddelay = conn.forward_delay + file.bridge_stp = conn.stp ? "on" : "off" + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 38c50aa35..eeb5c1715 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -254,6 +254,24 @@ def variable_name(param_name) # @return [String] VLAN ID define_variable(:vlan_id, :integer) + ## BRIDGE + + # @!attribute [r] bridge + # @return [String] whether the interface is a bridge or not + define_variable(:bridge) + + # @!attribute [r] bridge_ports + # @return [String] interfaces members of the bridge + define_variable(:bridge_ports) + + # @!attribute [r] bridge_stp + # @return [String] Spanning Tree Protocol ("off" or "on") + define_variable(:bridge_stp) + + # @!attribute [r] bridge_forwarddelay + # @return [Integer] + define_variable(:bridge_forwarddelay, :integer) + # Constructor # # @param interface [String] Interface interface @@ -301,9 +319,9 @@ def save # # @return [Y2Network::InterfaceType] Interface's type depending on the file values def type - return InterfaceType::DUMMY if @values["INTERFACETYPE"] == "dummy" + return InterfaceType::DUMMY if interfacetype == "dummy" + return InterfaceType::BRIDGE if bridge == "yes" return InterfaceType::BONDING if defined_variables.any? { |k| k.start_with?("BOND") } - return InterfaceType::BRIDGE if defined_variables.any? { |k| k.start_with?("BRIDGE") } return InterfaceType::WIRELESS if defined_variables.any? { |k| k.start_with?("WIRELESS") } return InterfaceType::VLAN if defined_variables.include? "ETHERDEVICE" return InterfaceType::INFINIBAND if defined_variables.include? "IPOIB_MODE" diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-br0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-br0 new file mode 100644 index 000000000..385fc11bd --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-br0 @@ -0,0 +1,6 @@ +STARTMODE='auto' +BOOTPROTO='dhcp' +BRIDGE='yes' +BRIDGE_PORTS='eth0 eth1' +BRIDGE_STP='on' +BRIDGE_FORWARDDELAY='5' diff --git a/test/y2network/sysconfig/connection_config_readers/bridge_test.rb b/test/y2network/sysconfig/connection_config_readers/bridge_test.rb new file mode 100644 index 000000000..fe57a1536 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/bridge_test.rb @@ -0,0 +1,47 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/bridge" +require "y2network/sysconfig/interface_file" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Bridge do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "br0" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a bridge connection config object" do + bridge_conn = handler.connection_config + expect(bridge_conn.interface).to eq("br0") + expect(bridge_conn.ports).to eq(["eth0", "eth1"]) + expect(bridge_conn.stp).to eq("on") + expect(bridge_conn.forward_delay).to eq(5) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/bridge_test.rb b/test/y2network/sysconfig/connection_config_writers/bridge_test.rb new file mode 100644 index 000000000..fc1a9d0df --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/bridge_test.rb @@ -0,0 +1,84 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/bridge" +require "y2network/sysconfig/interface_file" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/bridge" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Bridge do + subject(:handler) { described_class.new(file) } + + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } + + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Bridge, + name: "br1", + interface: "br1", + description: "", + startmode: Y2Network::Startmode.create("auto"), + bootproto: Y2Network::BootProtocol::DHCP, + ip_configs: [], + ports: ["eth0", "eth1"], + stp: false, + forward_delay: 5 + ) + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + name: conn.description, + startmode: "auto", + bootproto: "dhcp" + ) + end + + it "writes bridge properties" do + handler.write(conn) + expect(file).to have_attributes( + bridge: "yes", + bridge_ports: "eth0 eth1", + bridge_forwarddelay: 5, + bridge_stp: "off" + ) + end + end +end From c3b619b00ebb18073616595a0172383d7450c987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 29 Jul 2019 12:03:32 +0100 Subject: [PATCH 115/471] Fix InterfacesCollection documentation --- src/lib/y2network/interfaces_collection.rb | 31 ++++++++++------------ 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index c269adae7..e9581cedc 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -17,31 +17,28 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "yast" require "y2network/interface" require "forwardable" module Y2Network - # A container for network devices. In the end should implement methods for mass operations over - # network interfaces like old LanItems::find_dhcp_ifaces. + # A container for network devices. # - # @example Create a new collection - # eth0 = Y2Network::Interface.new("eth0") - # collection = Y2Network::InterfacesCollection.new(eth0) + # Objects of this class are able to keep a list of interfaces and perform simple queries + # on such a list. In the end should implement methods for mass operations over network + # interfaces like old LanItems::find_dhcp_ifaces. + # + # @example Finding an interface by its name + # interfaces = Y2Network::InterfacesCollection.new([eth0, wlan0]) + # interfaces.by_name("wlan0") # => wlan0 # # @example Find an interface using its name # iface = collection.by_name("eth0") #=> # + # + # @example FIXME (not implemented yet). For the future, we are aiming at this kind of API. + # interfaces = Y2Network::InterfacesCollection.new([eth0, wlan0]) + # interfaces.of_type(:eth).to_a # => [eth0] class InterfacesCollection - # Objects of this class are able to keep a list of interfaces and perform simple queries - # on such a list. - # - # @example Finding an interface by its name - # interfaces = Y2Network::InterfacesCollection.new([eth0, wlan0]) - # interfaces.by_name("wlan0") # => wlan0 - # - # @example FIXME (not implemented yet). For the future, we are aiming at this kind of API. - # interfaces = Y2Network::InterfacesCollection.new([eth0, wlan0]) - # interfaces.of_type(:eth).to_a # => [eth0] - extend Forwardable include Yast::Logger @@ -60,7 +57,7 @@ def initialize(interfaces = []) # Returns an interface with the given name if present # - # @todo It uses the hardware's name as a fallback if interface's name is not set + # @note It uses the hardware's name as a fallback if interface's name is not set # # @param name [String] interface name ("eth0", "br1", ...) # @return [Interface,nil] Interface with the given name or nil if not found From aa18179de15dd69b0e61533bb6a05002eabf7f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 29 Jul 2019 12:05:14 +0100 Subject: [PATCH 116/471] Add a collection class for ConnectionConfig objects --- .../connection_configs_collection.rb | 56 +++++++++++++++++++ .../connection_configs_collection_test.rb | 43 ++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 src/lib/y2network/connection_configs_collection.rb create mode 100644 test/y2network/connection_configs_collection_test.rb diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb new file mode 100644 index 000000000..a20742732 --- /dev/null +++ b/src/lib/y2network/connection_configs_collection.rb @@ -0,0 +1,56 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "forwardable" + +module Y2Network + # A container for connection configurations objects. + # + # @example Create a new collection + # eth0 = Y2Network::ConnectionConfig::Ethernet.new + # collection = Y2Network::ConnectionConfigsCollection.new([eth0]) + # + # @example Find a connection config using its name + # config = collection.by_name("eth0") #=> # + class ConnectionConfigsCollection + extend Forwardable + include Yast::Logger + + attr_reader :connection_configs + alias_method :to_a, :connection_configs + + def_delegators :@connection_configs, :each, :push, :<<, :reject!, :map, :flat_map, :any? + + # Constructor + # + # @param connection_configs [Array] List of connection configurations + def initialize(connection_configs = []) + @connection_configs = connection_configs + end + + # Returns a connection configuration with the given name if present + # + # @param name [String] Connection name + # @return [ConnectionConfig::Base,nil] Connection config with the given name or nil if not found + def by_name(name) + connection_configs.find { |c| c.name == name } + end + end +end diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb new file mode 100644 index 000000000..ae62ab2ea --- /dev/null +++ b/test/y2network/connection_configs_collection_test.rb @@ -0,0 +1,43 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" +require "y2network/connection_configs_collection" +require "y2network/connection_config/ethernet" +require "y2network/connection_config/wireless" + +describe Y2Network::ConnectionConfigsCollection do + subject(:collection) { described_class.new(connections) } + + let(:connections) { [eth0, wlan0] } + let(:eth0) { Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } } + let(:wlan0) { Y2Network::ConnectionConfig::Wireless.new.tap { |c| c.name = "wlan0" } } + + describe "#by_name" do + it "returns the connection configuration with the given name" do + expect(collection.by_name("eth0")).to eq(eth0) + end + + context "when name is not defined" do + it "returns nil" do + expect(collection.by_name("eth1")).to be_nil + end + end + end +end From a0295018ce4c2fde148999e9efc449fbd4ef94d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 29 Jul 2019 12:15:11 +0100 Subject: [PATCH 117/471] Add Y2Network::ConnectionConfigsCollection#update --- src/lib/y2network/connection_configs_collection.rb | 10 ++++++++++ test/y2network/connection_configs_collection_test.rb | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index a20742732..d8b099147 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -52,5 +52,15 @@ def initialize(connection_configs = []) def by_name(name) connection_configs.find { |c| c.name == name } end + + # Updates a connection configuration + # + # @note It uses the name to do the matching. + # + # @param connection_config [ConnectionConfig::Base] New connection configuration object + def update(connection_config) + idx = connection_configs.find_index { |c| c.name == connection_config.name } + connection_configs[idx] = connection_config if idx + end end end diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb index ae62ab2ea..14602ebda 100644 --- a/test/y2network/connection_configs_collection_test.rb +++ b/test/y2network/connection_configs_collection_test.rb @@ -40,4 +40,13 @@ end end end + + describe "#update" do + let(:eth0_1) { Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } } + + it "replaces the connection configuration having the same name with the given object" do + collection.update(eth0_1) + expect(collection.by_name("eth0")).to be(eth0_1) + end + end end From c9153315e0fd056156b2bca5a9a36a62fe58f68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 29 Jul 2019 12:26:51 +0100 Subject: [PATCH 118/471] Update Y2Network::Config to use ConnectionConfigsCollection --- src/include/network/lan/cmdline.rb | 2 +- src/lib/y2network/config.rb | 15 +++++++++------ src/lib/y2network/sysconfig/interfaces_reader.rb | 4 +++- .../y2network/sysconfig/interfaces_reader_test.rb | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index 5659212d5..c4844bd67 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -215,7 +215,7 @@ def EditHandler(options) LanItems.current = getItem(options, config) config = Lan.yast_config.copy - connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + connection_config = config.connections.by_name(LanItems.GetCurrentName) builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) builder.name = LanItems.GetCurrentName() LanItems.SetItem(builder: builder) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 308f1ab4d..f10c22cbe 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -21,6 +21,7 @@ require "y2network/routing" require "y2network/dns" require "y2network/interfaces_collection" +require "y2network/connection_configs_collection" module Y2Network # This class represents the current network configuration including interfaces, @@ -38,7 +39,7 @@ module Y2Network class Config # @return [InterfacesCollection] attr_accessor :interfaces - # @return [Array] + # @return [ConnectionConfigsCollection] attr_accessor :connections # @return [Routing] Routing configuration attr_accessor :routing @@ -87,11 +88,13 @@ def configs # Constructor # - # @param interfaces [InterfacesCollection] List of interfaces - # @param routing [Routing] Object with routing configuration - # @param dns [DNS] Object with DNS configuration - # @param source [Symbol] Configuration source - def initialize(interfaces: InterfacesCollection.new, connections: [], routing: Routing.new, dns: DNS.new, source:) + # @param interfaces [InterfacesCollection] List of interfaces + # @param connections [ConnectionConfigsCollection] List of connection configurations + # @param routing [Routing] Object with routing configuration + # @param dns [DNS] Object with DNS configuration + # @param source [Symbol] Configuration source + def initialize(interfaces: InterfacesCollection.new, connections: ConnectionConfigsCollection.new, + routing: Routing.new, dns: DNS.new, source:) @interfaces = interfaces @connections = connections @routing = routing diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 22fc1d5c5..2be4c3a63 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -24,6 +24,8 @@ require "y2network/physical_interface" require "y2network/fake_interface" require "y2network/sysconfig/connection_config_reader" +require "y2network/interfaces_collection" +require "y2network/connection_configs_collection" Yast.import "LanItems" Yast.import "NetworkInterfaces" @@ -81,7 +83,7 @@ def find_physical_interfaces # Finds the connections configurations def find_connections @connections ||= - configured_devices.each_with_object([]) do |name, conns| + configured_devices.each_with_object(ConnectionConfigsCollection.new([])) do |name, conns| interface = @interfaces.by_name(name) connection = ConnectionConfigReader.new.read( name, diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index 15b1e23b2..1184f6158 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -80,7 +80,7 @@ describe "#connections" do it "reads ethernet connections" do connections = reader.connections - conn = connections.find { |i| i.interface == "eth0" } + conn = connections.by_name("eth0") expect(conn.interface).to eq("eth0") end end From 95bb39d8bc4af2c9533b387ef18c7eda589493f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 29 Jul 2019 17:00:33 +0100 Subject: [PATCH 119/471] Adapt the code to use the new ConnectionConfigsCollection class --- src/include/network/lan/complex.rb | 6 +++--- src/modules/LanItems.rb | 2 +- test/default_route_test.rb | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index 2f3385c5a..8a433e782 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -310,14 +310,14 @@ def UpdateSlaves current = LanItems.current config = Lan.yast_config.copy - connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + connection_config = config.connections.by_name(LanItems.GetCurrentName) Yast.y2milestone("update slaves for #{current}:#{LanItems.GetCurrentName}:#{LanItems.GetCurrentType}") master_builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) master_builder.name = LanItems.GetCurrentName() Lan.autoconf_slaves.each do |dev| if LanItems.FindAndSelect(dev) - connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + connection_config = config.connections.by_name(LanItems.GetCurrentName) builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) builder.name = LanItems.GetCurrentName() LanItems.SetItem(builder: builder) @@ -415,7 +415,7 @@ def handleOverview(_key, event) when :edit if LanItems.IsCurrentConfigured config = Lan.yast_config.copy - connection_config = config.connections.find { |c| c.name == LanItems.GetCurrentName } + connection_config = config.connections.by_name(LanItems.GetCurrentName) builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) builder.name = LanItems.GetCurrentName() LanItems.SetItem(builder: builder) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index a9c776d46..a5a3f2fbf 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -2388,7 +2388,7 @@ def move_routes(from, to) return unless config && config.routing routing = config.routing add_device_to_routing(to) - target_interface = config.interfaces.find { |i| i.name == to } + target_interface = config.interfaces.by_name(to) return unless target_interface routing.routes.select { |r| r.interface && r.interface.name == from } .each { |r| r.interface = target_interface } diff --git a/test/default_route_test.rb b/test/default_route_test.rb index 4bd239f50..10098d0fe 100755 --- a/test/default_route_test.rb +++ b/test/default_route_test.rb @@ -5,9 +5,17 @@ require "network/install_inf_convertor" require "y2network/interface_config_builder" +Yast.import "Lan" + describe "Yast::LanItemsClass" do subject { Yast::LanItems } + let(:config) { Y2Network::Config.new(source: :sysconfig) } + + before do + allow(Yast::Lan).to receive(:yast_config).and_return(config) + end + before do Yast.import "LanItems" From 1f04a936308b28f6fe07173ce114fc56deb13a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 29 Jul 2019 17:01:11 +0100 Subject: [PATCH 120/471] Fix collections usage in tests --- test/lan_items_helpers_test.rb | 3 ++- test/network_autoconfiguration_test.rb | 19 +++++++++++++++---- .../interface_config_builder_test.rb | 8 ++++++++ .../infiniband_test.rb | 6 ++++++ 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/test/lan_items_helpers_test.rb b/test/lan_items_helpers_test.rb index 02df20fca..e29633ad8 100755 --- a/test/lan_items_helpers_test.rb +++ b/test/lan_items_helpers_test.rb @@ -761,8 +761,9 @@ def mock_dhcp_setup(ifaces, global) end let(:eth0) { Y2Network::Interface.new("eth0") } let(:br0) { Y2Network::Interface.new("br0") } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, br0]) } let(:yast_config) do - instance_double(Y2Network::Config, interfaces: [eth0, br0], routing: routing) + instance_double(Y2Network::Config, interfaces: interfaces, routing: routing) end before do diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 0c761efb6..0bd549098 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -9,6 +9,7 @@ require "y2network/route" Yast.import "NetworkInterfaces" +Yast.import "Lan" # @return one item for a .probe.netcard list def probe_netcard_factory(num) @@ -47,6 +48,14 @@ def probe_netcard_factory(num) end describe Yast::NetworkAutoconfiguration do + let(:yast_config) { Y2Network::Config.new(source: :sysconfig) } + let(:system_config) { yast_config.copy } + + before do + Yast::Lan.add_config(:yast, yast_config) + Yast::Lan.add_config(:system, system_config) + end + describe "it sets DHCLIENT_SET_DEFAULT_ROUTE properly" do let(:instance) { Yast::NetworkAutoconfiguration.instance } let(:network_interfaces) { double("NetworkInterfaces") } @@ -198,10 +207,10 @@ def probe_netcard_factory(num) end let(:eth0) { Y2Network::Interface.new("eth0") } let(:br0) { Y2Network::Interface.new("br0") } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, br0]) } let(:yast_config) do - Y2Network::Config.new(interfaces: [eth0, br0], routing: routing, source: :testing) + Y2Network::Config.new(interfaces: interfaces, routing: routing, source: :testing) end - let(:system_config) { yast_config.copy } let(:instance) { Yast::NetworkAutoconfiguration.instance } let(:proposal) { false } let(:eth0_profile) do @@ -231,8 +240,10 @@ def probe_netcard_factory(num) allow(Yast::LanItems).to receive(:Read) allow(yast_config).to receive(:write) allow(Yast::Lan).to receive(:connected_and_bridgeable?).and_return(true) - Yast::Lan.Import("devices" => { "eth" => { "eth0" => eth0_profile } }, - "routing" => { "routes" => routes_profile }) + Yast::Lan.Import( + "devices" => { "eth" => { "eth0" => eth0_profile } }, + "routing" => { "routes" => routes_profile } + ) end context "when the proposal is not required" do diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index f20fc6021..8ecfcd3e7 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -5,6 +5,8 @@ require "yast" require "y2network/interface_config_builder" +Yast.import "Lan" + describe Y2Network::InterfaceConfigBuilder do subject(:config_builder) do res = Y2Network::InterfaceConfigBuilder.for("eth") @@ -12,6 +14,12 @@ res end + let(:config) { Y2Network::Config.new(source: :sysconfig) } + + before do + allow(Yast::Lan).to receive(:yast_config).and_return(config) + end + describe ".for" do context "specialized class for given type exists" do it "returns new instance of that class" do diff --git a/test/y2network/interface_config_builders/infiniband_test.rb b/test/y2network/interface_config_builders/infiniband_test.rb index 9d3f2aa28..9ad2abdb2 100644 --- a/test/y2network/interface_config_builders/infiniband_test.rb +++ b/test/y2network/interface_config_builders/infiniband_test.rb @@ -12,6 +12,12 @@ res end + let(:config) { Y2Network::Config.new(source: :sysconfig) } + + before do + allow(Yast::Lan).to receive(:yast_config).and_return(config) + end + describe "#type" do it "returns infiniband interface type" do expect(subject.type).to eq Y2Network::InterfaceType::INFINIBAND From 5754c0e3813f5fec23fb590fa60c61acd384e574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 29 Jul 2019 11:49:02 +0100 Subject: [PATCH 121/471] Added TUN / TAP connections --- src/lib/y2network/connection_config/tap.rb | 28 ++++++ src/lib/y2network/connection_config/tun.rb | 41 +++++++++ .../connection_config_readers/infiniband.rb | 1 + .../connection_config_readers/tap.rb | 31 +++++++ .../connection_config_readers/tun.rb | 39 +++++++++ .../connection_config_readers/vlan.rb | 2 + .../connection_config_writers/tap.rb | 38 ++++++++ .../connection_config_writers/tun.rb | 39 +++++++++ src/lib/y2network/sysconfig/interface_file.rb | 43 +++++++-- .../scr_read/etc/sysconfig/network/ifcfg-tap0 | 5 ++ .../scr_read/etc/sysconfig/network/ifcfg-tun0 | 5 ++ test/y2network/connection_config/tap_test.rb | 32 +++++++ test/y2network/connection_config/tun_test.rb | 32 +++++++ .../connection_config_readers/tap_test.rb | 47 ++++++++++ .../connection_config_readers/tun_test.rb | 47 ++++++++++ .../connection_config_writers/tap_test.rb | 87 +++++++++++++++++++ .../connection_config_writers/tun_test.rb | 87 +++++++++++++++++++ .../sysconfig/interface_file_test.rb | 10 +++ 18 files changed, 606 insertions(+), 8 deletions(-) create mode 100644 src/lib/y2network/connection_config/tap.rb create mode 100644 src/lib/y2network/connection_config/tun.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/tap.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/tun.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/tap.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/tun.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-tap0 create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-tun0 create mode 100644 test/y2network/connection_config/tap_test.rb create mode 100644 test/y2network/connection_config/tun_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/tap_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/tun_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/tap_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/tun_test.rb diff --git a/src/lib/y2network/connection_config/tap.rb b/src/lib/y2network/connection_config/tap.rb new file mode 100644 index 000000000..007f112b8 --- /dev/null +++ b/src/lib/y2network/connection_config/tap.rb @@ -0,0 +1,28 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/tun" + +module Y2Network + module ConnectionConfig + # Configuration for TAP connections + class Tap < Tun + end + end +end diff --git a/src/lib/y2network/connection_config/tun.rb b/src/lib/y2network/connection_config/tun.rb new file mode 100644 index 000000000..c206831be --- /dev/null +++ b/src/lib/y2network/connection_config/tun.rb @@ -0,0 +1,41 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for TUN connections + class Tun < Base + # @return [String] tunnel owner (name or UID) + attr_accessor :owner + # @return [String] tunnel group (name or GID) + attr_accessor :group + + def initialize + @owner = "" + @group = "" + end + + def virtual? + true + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb b/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb index 1ddfbeb3e..7b4b68929 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb @@ -28,6 +28,7 @@ module ConnectionConfigReaders class Infiniband < Base private + # @param conn [Y2Network::ConnectionConfig::Infiniband] # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.ipoib_mode = IpoibMode.from_name(file.ipoib_mode.to_s) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/tap.rb b/src/lib/y2network/sysconfig/connection_config_readers/tap.rb new file mode 100644 index 000000000..1354169ca --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/tap.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/tun" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Tap object given a + # Sysconfig::InterfaceFile object. + class Tap < Tun + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/tun.rb b/src/lib/y2network/sysconfig/connection_config_readers/tun.rb new file mode 100644 index 000000000..c3df84f38 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/tun.rb @@ -0,0 +1,39 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Tun object given a + # Sysconfig::InterfaceFile object. + class Tun < Base + private + + # @param conn [Y2Network::ConnectionConfig::Tun] + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(conn) + conn.owner = file.tunnel_set_owner + conn.group = file.tunnel_set_group + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb b/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb index 804d6f351..978e812cb 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb @@ -28,6 +28,8 @@ module ConnectionConfigReaders class Vlan < Base private + # @param conn [Y2Network::ConnectionConfig::Vlan] + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.parent_device = file.etherdevice conn.vlan_id = file.vlan_id diff --git a/src/lib/y2network/sysconfig/connection_config_writers/tap.rb b/src/lib/y2network/sysconfig/connection_config_writers/tap.rb new file mode 100644 index 000000000..0353a4262 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/tap.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/tun" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Tap + # object to the underlying system. + class Tap < Tun + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(conn) + super + file.tunnel = "tap" + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/tun.rb b/src/lib/y2network/sysconfig/connection_config_writers/tun.rb new file mode 100644 index 000000000..b1b7e3407 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/tun.rb @@ -0,0 +1,39 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Tun + # object to the underlying system. + class Tun < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(conn) + file.tunnel = "tun" + file.tunnel_set_owner = conn.owner + file.tunnel_set_group = conn.group + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index eeb5c1715..47d90bd02 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -272,6 +272,20 @@ def variable_name(param_name) # @return [Integer] define_variable(:bridge_forwarddelay, :integer) + ## TUN / TAP + + # @!attribute [r] tunnel + # @return [String] tunnel protocol ("sit", "gre", "ipip", "tun", "tap") + define_variable(:tunnel) + + # @!attribute [r] tunnel_set_owner + # @return [String] tunnel owner + define_variable(:tunnel_set_owner) + + # @!attribute [r] tunnel_set_group + # @return [String] tunnel group + define_variable(:tunnel_set_group) + # Constructor # # @param interface [String] Interface interface @@ -319,14 +333,7 @@ def save # # @return [Y2Network::InterfaceType] Interface's type depending on the file values def type - return InterfaceType::DUMMY if interfacetype == "dummy" - return InterfaceType::BRIDGE if bridge == "yes" - return InterfaceType::BONDING if defined_variables.any? { |k| k.start_with?("BOND") } - return InterfaceType::WIRELESS if defined_variables.any? { |k| k.start_with?("WIRELESS") } - return InterfaceType::VLAN if defined_variables.include? "ETHERDEVICE" - return InterfaceType::INFINIBAND if defined_variables.include? "IPOIB_MODE" - - InterfaceType::ETHERNET + type_from_keys || type_from_values || InterfaceType::ETHERNET end # Empties all known values @@ -342,6 +349,26 @@ def clean private + # Determine the Interface type based on specific values + # + # @return [Y2Network::InterfaceType, nil] + def type_from_values + return InterfaceType::DUMMY if interfacetype == "dummy" + return InterfaceType::BRIDGE if bridge == "yes" + return InterfaceType::TUN if @values["TUNNEL"] == "tun" + return InterfaceType::TAP if @values["TUNNEL"] == "tap" + end + + # Determine the Interface type based on defined variables + # + # @return [Y2Network::InterfaceType, nil] + def type_from_keys + return InterfaceType::BONDING if defined_variables.any? { |k| k.start_with?("BOND") } + return InterfaceType::WIRELESS if defined_variables.any? { |k| k.start_with?("WIRELESS") } + return InterfaceType::VLAN if defined_variables.include? "ETHERDEVICE" + return InterfaceType::INFINIBAND if defined_variables.include? "IPOIB_MODE" + end + # Returns a list of those keys that have a value # # @return [Array] name of keys that are included in the file diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-tap0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-tap0 new file mode 100644 index 000000000..27eaf2d1a --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-tap0 @@ -0,0 +1,5 @@ +STARTMODE='auto' +BOOTPROTO='static' +TUNNEL='tap' +TUNNEL_SET_OWNER='nobody' +TUNNEL_SET_GROUP='nobody' diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-tun0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-tun0 new file mode 100644 index 000000000..655002435 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-tun0 @@ -0,0 +1,5 @@ +STARTMODE='manual' +BOOTPROTO='static' +TUNNEL='tun' +TUNNEL_SET_OWNER='nobody' +TUNNEL_SET_GROUP='nobody' diff --git a/test/y2network/connection_config/tap_test.rb b/test/y2network/connection_config/tap_test.rb new file mode 100644 index 000000000..a74906d1a --- /dev/null +++ b/test/y2network/connection_config/tap_test.rb @@ -0,0 +1,32 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/tap" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Tap do + subject(:config) { described_class.new } + + describe "#type" do + it "returns 'tap'" do + expect(config.type).to eq(Y2Network::InterfaceType::TAP) + end + end +end diff --git a/test/y2network/connection_config/tun_test.rb b/test/y2network/connection_config/tun_test.rb new file mode 100644 index 000000000..cae6a49e1 --- /dev/null +++ b/test/y2network/connection_config/tun_test.rb @@ -0,0 +1,32 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/tun" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Tun do + subject(:config) { described_class.new } + + describe "#type" do + it "returns 'tun'" do + expect(config.type).to eq(Y2Network::InterfaceType::TUN) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/tap_test.rb b/test/y2network/sysconfig/connection_config_readers/tap_test.rb new file mode 100644 index 000000000..363910fdb --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/tap_test.rb @@ -0,0 +1,47 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/tap" +require "y2network/sysconfig/interface_file" +require "y2network/interface_type" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Tap do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "tap0" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a tap connection config object" do + tap_conn = handler.connection_config + expect(tap_conn.interface).to eq("tap0") + expect(tap_conn.type).to eq(Y2Network::InterfaceType::TAP) + expect(tap_conn.owner).to eq("nobody") + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/tun_test.rb b/test/y2network/sysconfig/connection_config_readers/tun_test.rb new file mode 100644 index 000000000..45fc8cac2 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/tun_test.rb @@ -0,0 +1,47 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/tun" +require "y2network/sysconfig/interface_file" +require "y2network/interface_type" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Tun do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "tun0" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a tun connection config object" do + tun_conn = handler.connection_config + expect(tun_conn.interface).to eq("tun0") + expect(tun_conn.type).to eq(Y2Network::InterfaceType::TUN) + expect(tun_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/tap_test.rb b/test/y2network/sysconfig/connection_config_writers/tap_test.rb new file mode 100644 index 000000000..9323a5edf --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/tap_test.rb @@ -0,0 +1,87 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/tap" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/tap" +require "y2network/connection_config/ip_config" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Tap do + subject(:handler) { described_class.new(file) } + + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } + + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Tap, + name: "tap1", + interface: "tap1", + owner: "nobody", + group: "nobody", + description: "", + bootproto: Y2Network::BootProtocol::STATIC, + ip_configs: [], + startmode: Y2Network::Startmode.create("auto") + ) + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "static", + startmode: "auto" + ) + end + + it "writes 'tunnel' as 'tap'" do + handler.write(conn) + expect(file).to have_attributes( + tunnel: "tap" + ) + end + + it "writes the 'tunnel_set_owner' and 'tunnel_set_group'" do + handler.write(conn) + expect(file).to have_attributes( + tunnel_set_owner: "nobody", + tunnel_set_group: "nobody" + ) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/tun_test.rb b/test/y2network/sysconfig/connection_config_writers/tun_test.rb new file mode 100644 index 000000000..2511fde66 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/tun_test.rb @@ -0,0 +1,87 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/tun" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/tun" +require "y2network/connection_config/ip_config" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Tun do + subject(:handler) { described_class.new(file) } + + def file_content(scr_root, file) + path = File.join(scr_root, file.path.to_s) + File.read(path) + end + + let(:scr_root) { Dir.mktmpdir } + + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Tun, + name: "tun1", + interface: "tun1", + owner: "nobody", + group: "nobody", + description: "", + bootproto: Y2Network::BootProtocol::STATIC, + ip_configs: [], + startmode: Y2Network::Startmode.create("auto") + ) + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "static", + startmode: "auto" + ) + end + + it "writes 'tunnel' as 'tun'" do + handler.write(conn) + expect(file).to have_attributes( + tunnel: "tun" + ) + end + + it "writes the 'tunnel_set_owner' and 'tunnel_set_group'" do + handler.write(conn) + expect(file).to have_attributes( + tunnel_set_owner: "nobody", + tunnel_set_group: "nobody" + ) + end + end +end diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 5b080040b..5954d046f 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -183,4 +183,14 @@ def file_content(scr_root, file) expect(content).to match("IPADDR_0=''") end end + + describe "#type" do + it "determines the interface type from the attributes" do + file.interfacetype = "dummy" + expect(file.type.short_name).to eql("dummy") + file.interfacetype = nil + file.tunnel = "tap" + expect(file.type.short_name).to eql("tap") + end + end end From 15339689a61ebed7a0c95f15a7a5e5916ccd7c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 29 Jul 2019 12:43:32 +0100 Subject: [PATCH 122/471] Do not inherit tap connection from tun. --- src/lib/y2network/connection_config/tap.rb | 17 +++++++++++++++-- .../sysconfig/connection_config_readers/tap.rb | 12 ++++++++++-- .../sysconfig/connection_config_writers/tap.rb | 7 ++++--- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/connection_config/tap.rb b/src/lib/y2network/connection_config/tap.rb index 007f112b8..13db44305 100644 --- a/src/lib/y2network/connection_config/tap.rb +++ b/src/lib/y2network/connection_config/tap.rb @@ -17,12 +17,25 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/connection_config/tun" +require "y2network/connection_config/base" module Y2Network module ConnectionConfig # Configuration for TAP connections - class Tap < Tun + class Tap < Base + # @return [String] tunnel owner (name or UID) + attr_accessor :owner + # @return [String] tunnel group (name or GID) + attr_accessor :group + + def initialize + @owner = "" + @group = "" + end + + def virtual? + true + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/tap.rb b/src/lib/y2network/sysconfig/connection_config_readers/tap.rb index 1354169ca..907a89efc 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/tap.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/tap.rb @@ -17,14 +17,22 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_readers/tun" +require "y2network/sysconfig/connection_config_readers/base" module Y2Network module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Tap object given a # Sysconfig::InterfaceFile object. - class Tap < Tun + class Tap < Base + private + + # @param conn [Y2Network::ConnectionConfig::Tap] + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(conn) + conn.owner = file.tunnel_set_owner + conn.group = file.tunnel_set_group + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/tap.rb b/src/lib/y2network/sysconfig/connection_config_writers/tap.rb index 0353a4262..ce2a50d6a 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/tap.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/tap.rb @@ -17,20 +17,21 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_writers/tun" +require "y2network/sysconfig/connection_config_writers/base" module Y2Network module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Tap # object to the underlying system. - class Tap < Tun + class Tap < Base private # @see Y2Network::ConnectionConfigWriters::Base#update_file def update_file(conn) - super file.tunnel = "tap" + file.tunnel_set_owner = conn.owner + file.tunnel_set_group = conn.group end end end From 3932e25aa46e6909ba4b22ad0b9890e700e35d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 29 Jul 2019 15:59:01 +0100 Subject: [PATCH 123/471] Changes based on CR. --- src/lib/y2network/sysconfig/interface_file.rb | 9 +++++---- .../sysconfig/connection_config_readers/tap_test.rb | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 47d90bd02..4f614752e 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -349,17 +349,18 @@ def clean private - # Determine the Interface type based on specific values + # Determines the Interface type based on specific values # # @return [Y2Network::InterfaceType, nil] def type_from_values return InterfaceType::DUMMY if interfacetype == "dummy" return InterfaceType::BRIDGE if bridge == "yes" - return InterfaceType::TUN if @values["TUNNEL"] == "tun" - return InterfaceType::TAP if @values["TUNNEL"] == "tap" + # TODO: Add support for ip-tunnels + return InterfaceType::TUN if tunnel == "tun" + return InterfaceType::TAP if tunnel == "tap" end - # Determine the Interface type based on defined variables + # Determines the Interface type based on defined variables # # @return [Y2Network::InterfaceType, nil] def type_from_keys diff --git a/test/y2network/sysconfig/connection_config_readers/tap_test.rb b/test/y2network/sysconfig/connection_config_readers/tap_test.rb index 363910fdb..374a86e44 100644 --- a/test/y2network/sysconfig/connection_config_readers/tap_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/tap_test.rb @@ -42,6 +42,7 @@ expect(tap_conn.interface).to eq("tap0") expect(tap_conn.type).to eq(Y2Network::InterfaceType::TAP) expect(tap_conn.owner).to eq("nobody") + expect(tap_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) end end end From 6e4cf602e945b1b2ef377e23c0c24b0dc975c2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 29 Jul 2019 17:06:12 +0100 Subject: [PATCH 124/471] Drop NetworkInterfaces.Write call in LanItems.write --- src/lib/y2network/interface_config_builder.rb | 2 ++ src/modules/LanItems.rb | 3 ++- test/y2network/interface_config_builder_test.rb | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index caa66d923..544086df8 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -92,6 +92,8 @@ def save Yast::LanItems.driver_options[driver] = driver_options end + Yast::Lan.yast_config.connections.update(@connection_config) + # create new instance as name can change firewall_interface = Y2Firewall::Firewalld::Interface.new(name) if Y2Firewall::Firewalld.instance.installed? diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index a5a3f2fbf..32b90d74a 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -737,8 +737,9 @@ def write LanItems.WriteUdevRules if !Stage.cont && InstallInfConvertor.instance.AllowUdevModify + # FIXME: remove this code # FIXME: hack: no "netcard" filter as biosdevname names it diferently (bnc#712232) - NetworkInterfaces.Write("") + # NetworkInterfaces.Write("") end # Exports configuration for use in AY profile diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 8ecfcd3e7..a9171ea64 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -55,6 +55,11 @@ expect(Yast::LanItems.driver_options["e1000e"]).to eq "test" end + it "saves connection config" do + expect(config.connections).to receive(:update).with(Y2Network::ConnectionConfig::Base) + subject.save + end + it "stores aliases" do # Avoid deleting old aliases as it can break other tests, due to singleton NetworkInterfaces allow(Yast::NetworkInterfaces).to receive(:DeleteAlias) From 1ab577b13409c3e97dab0c3cc0f43f449f1725b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 30 Jul 2019 09:19:34 +0100 Subject: [PATCH 125/471] Improve ConnectionConfigsCollection API --- .../connection_configs_collection.rb | 22 +++++++-- src/lib/y2network/interface_config_builder.rb | 2 +- .../connection_configs_collection_test.rb | 48 +++++++++++++++++-- .../interface_config_builder_test.rb | 2 +- 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index d8b099147..5fa3f55ea 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -36,7 +36,7 @@ class ConnectionConfigsCollection attr_reader :connection_configs alias_method :to_a, :connection_configs - def_delegators :@connection_configs, :each, :push, :<<, :reject!, :map, :flat_map, :any? + def_delegators :@connection_configs, :each, :push, :<<, :reject!, :map, :flat_map, :any?, :size # Constructor # @@ -53,14 +53,28 @@ def by_name(name) connection_configs.find { |c| c.name == name } end - # Updates a connection configuration + # Adds or updates a connection configuration # # @note It uses the name to do the matching. # # @param connection_config [ConnectionConfig::Base] New connection configuration object - def update(connection_config) + def add_or_update(connection_config) idx = connection_configs.find_index { |c| c.name == connection_config.name } - connection_configs[idx] = connection_config if idx + if idx + connection_configs[idx] = connection_config + else + connection_configs << connection_config + end + end + + # Removes a connection configuration + # + # @note It uses the name to do the matching. + # + # @param connection_config [ConnectionConfig::Base,String] Connection configuration object or name + def remove(connection_config) + name = connection_config.respond_to?(:name) ? connection_config.name : connection_config + connection_configs.reject! { |c| c.name == name } end end end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 544086df8..f3d95c545 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -92,7 +92,7 @@ def save Yast::LanItems.driver_options[driver] = driver_options end - Yast::Lan.yast_config.connections.update(@connection_config) + Yast::Lan.yast_config.connections.add_or_update(@connection_config) # create new instance as name can change firewall_interface = Y2Firewall::Firewalld::Interface.new(name) diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb index 14602ebda..7cff42d69 100644 --- a/test/y2network/connection_configs_collection_test.rb +++ b/test/y2network/connection_configs_collection_test.rb @@ -41,12 +41,52 @@ end end - describe "#update" do + describe "#add_or_update" do let(:eth0_1) { Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } } - it "replaces the connection configuration having the same name with the given object" do - collection.update(eth0_1) - expect(collection.by_name("eth0")).to be(eth0_1) + context "when a connection configuration having the same name exists" do + it "replaces the existing configuration with the new one" do + collection.add_or_update(eth0_1) + expect(collection.by_name("eth0")).to be(eth0_1) + expect(collection.size).to eq(2) + end + end + + context "if a connection configuration having the same name does not exist" do + let(:wlan1) { Y2Network::ConnectionConfig::Wireless.new.tap { |c| c.name = "wlan1" } } + + it "adds the configuration to the collection" do + collection.add_or_update(wlan1) + expect(collection.by_name("wlan1")).to be(wlan1) + expect(collection.size).to eq(3) + end + end + end + + describe "#remove" do + context "when a connection configuration having the same name exists" do + it "removes the configuration from the collection" do + collection.remove(eth0) + expect(collection.by_name("eth0")).to be_nil + expect(collection.size).to eq(1) + end + end + + context "when a name is given, instead of a connection configuration" do + it "removes the configuration with the given name" do + collection.remove("eth0") + expect(collection.by_name("eth0")).to be_nil + expect(collection.size).to eq(1) + end + end + + + context "when a connection configuration having the same name does not exists" do + let(:wlan1) { Y2Network::ConnectionConfig::Wireless.new.tap { |c| c.name = "wlan1" } } + + it "does not modify the collection" do + expect { collection.remove("wlan1") }.to_not change { collection.size } + end end end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index a9171ea64..1523e56df 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -56,7 +56,7 @@ end it "saves connection config" do - expect(config.connections).to receive(:update).with(Y2Network::ConnectionConfig::Base) + expect(config.connections).to receive(:add_or_update).with(Y2Network::ConnectionConfig::Base) subject.save end From 2575aee3ab41bd7227a030b6fc4fccf5b3abb9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 30 Jul 2019 10:54:18 +0100 Subject: [PATCH 126/471] Make RuboCop happy --- test/y2network/connection_configs_collection_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb index 7cff42d69..347a6129b 100644 --- a/test/y2network/connection_configs_collection_test.rb +++ b/test/y2network/connection_configs_collection_test.rb @@ -80,7 +80,6 @@ end end - context "when a connection configuration having the same name does not exists" do let(:wlan1) { Y2Network::ConnectionConfig::Wireless.new.tap { |c| c.name = "wlan1" } } From 54ab3276ff2ff5056d7f8b1ccb8b8b4d0ebe628a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 30 Jul 2019 12:46:33 +0100 Subject: [PATCH 127/471] Fix editing a missing connection config --- src/lib/y2network/connection_config.rb | 27 +++++++++++++++++++ src/lib/y2network/connection_config/base.rb | 4 +++ src/lib/y2network/interface_config_builder.rb | 16 ++++++++--- src/lib/y2network/sysconfig/interface_file.rb | 2 +- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 src/lib/y2network/connection_config.rb diff --git a/src/lib/y2network/connection_config.rb b/src/lib/y2network/connection_config.rb new file mode 100644 index 000000000..9ef19495e --- /dev/null +++ b/src/lib/y2network/connection_config.rb @@ -0,0 +1,27 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" +require "y2network/connection_config/bonding" +require "y2network/connection_config/dummy" +require "y2network/connection_config/ethernet" +require "y2network/connection_config/infiniband" +require "y2network/connection_config/ip_config" +require "y2network/connection_config/vlan" +require "y2network/connection_config/wireless" diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 361f03ac8..8ca22bc4c 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -18,6 +18,8 @@ # find current contact information at www.suse.com. require "y2network/interface_type" +require "y2network/boot_protocol" +require "y2network/startmode" module Y2Network module ConnectionConfig @@ -52,6 +54,8 @@ class Base # Constructor def initialize @ip_configs = [] + @bootproto = BootProtocol::STATIC + @startmode = Startmode.create("manual") end # Returns the connection type diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index f3d95c545..cbb5ee396 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -18,8 +18,7 @@ # find current contact information at www.suse.com. require "yast" -require "y2network/connection_config/base" -require "y2network/connection_config/ip_config" +require "y2network/connection_config" require "y2network/hwinfo" require "y2network/startmode" require "y2network/boot_protocol" @@ -74,7 +73,7 @@ def initialize(type:, config: nil) # edited with option for not yet created interface @newly_added = config.nil? # TODO: create specialized connection for type - @connection_config = config || ConnectionConfig::Base.new + @connection_config = config || connection_config_klass(type).new end def newly_added? @@ -92,6 +91,7 @@ def save Yast::LanItems.driver_options[driver] = driver_options end + @connection_config.interface = name Yast::Lan.yast_config.connections.add_or_update(@connection_config) # create new instance as name can change @@ -591,5 +591,15 @@ def select_backend(old, new) old end + + # Returns the connection config class for a given type + # + # @param type [Y2Network::InterfaceType] type of device + def connection_config_klass(type) + ConnectionConfig.const_get(type.name) + rescue NameError + log.error "Could not find a class to handle '#{type.name}' connections" + ConnectionConfig::Base + end end end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 38c50aa35..e9c8529d4 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -328,7 +328,7 @@ def clean # # @return [Array] name of keys that are included in the file def defined_variables - @defined_variables ||= Yast::SCR.Dir(Yast::Path.new(".network.value.\"#{interface}\"")) + @defined_variables ||= Yast::SCR.Dir(Yast::Path.new(".network.value.\"#{interface}\"")) || [] end # Fetches the value for a given key From d7fac57931128fdfbcdea417323f2cadd4a22ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 30 Jul 2019 13:28:59 +0100 Subject: [PATCH 128/471] Workaround failing test --- src/lib/y2network/interface_config_builder.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index cbb5ee396..40ff90002 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -308,7 +308,8 @@ def ethtool_options=(value) def ip_address old = @config["IPADDR"] - default = @connection_config.ip_configs.find { |c| c.id == "" } + # FIXME: workaround to remove when primary ip config is separated from the rest + default = (@connection_config.ip_configs || []).find { |c| c.id == "" } new_ = if default default.address.address else @@ -337,7 +338,7 @@ def subnet_prefix else @config["NETMASK"] || "" end - default = @connection_config.ip_configs.find { |c| c.id == "" } + default = (@connection_config.ip_configs || []).find { |c| c.id == "" } new_ = if default "/" + default.address.prefix.to_s else From 91c1265fb3bc3f8e0870f34b2d686cf6fe31add7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 31 Jul 2019 08:02:14 +0100 Subject: [PATCH 129/471] Update from code review --- src/modules/LanItems.rb | 4 ---- test/network_autoconfiguration_test.rb | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 32b90d74a..0aaca0c98 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -736,10 +736,6 @@ def write end LanItems.WriteUdevRules if !Stage.cont && InstallInfConvertor.instance.AllowUdevModify - - # FIXME: remove this code - # FIXME: hack: no "netcard" filter as biosdevname names it diferently (bnc#712232) - # NetworkInterfaces.Write("") end # Exports configuration for use in AY profile diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 0bd549098..3fa88164d 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -9,7 +9,6 @@ require "y2network/route" Yast.import "NetworkInterfaces" -Yast.import "Lan" # @return one item for a .probe.netcard list def probe_netcard_factory(num) @@ -52,8 +51,8 @@ def probe_netcard_factory(num) let(:system_config) { yast_config.copy } before do - Yast::Lan.add_config(:yast, yast_config) - Yast::Lan.add_config(:system, system_config) + Y2Network::Config.add(:yast, yast_config) + Y2Network::Config.add(:system, system_config) end describe "it sets DHCLIENT_SET_DEFAULT_ROUTE properly" do From fda6159de48323725726a8b60fcc3806fb6ee817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 31 Jul 2019 08:11:28 +0100 Subject: [PATCH 130/471] Added bonding connnection config --- .../y2network/connection_config/bonding.rb | 2 +- .../connection_config_readers/bonding.rb | 49 +++++++++++++++ .../connection_config_writers/bonding.rb | 49 +++++++++++++++ src/lib/y2network/sysconfig/interface_file.rb | 11 ++++ .../etc/sysconfig/network/ifcfg-bond0 | 6 ++ .../connection_config_readers/bonding_test.rb | 46 ++++++++++++++ .../connection_config_writers/bonding_test.rb | 63 +++++++++++++++++++ 7 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/bonding.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/bonding.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-bond0 create mode 100644 test/y2network/sysconfig/connection_config_readers/bonding_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/bonding_test.rb diff --git a/src/lib/y2network/connection_config/bonding.rb b/src/lib/y2network/connection_config/bonding.rb index c744c8a68..b5c6b6758 100644 --- a/src/lib/y2network/connection_config/bonding.rb +++ b/src/lib/y2network/connection_config/bonding.rb @@ -25,7 +25,7 @@ module ConnectionConfig # # @see https://www.kernel.org/doc/Documentation/networking/bonding.txt class Bonding < Base - # @return [Array] + # @return [Array] attr_accessor :slaves # @return [String] bond driver options attr_accessor :options diff --git a/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb b/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb new file mode 100644 index 000000000..ef4d24c57 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb @@ -0,0 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Bonding object given a + # SysconfigInterfaceFile object. + class Bonding < Base + private + + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(conn) + conn.slaves = slaves + conn.options = file.bonding_module_opts + end + + # Convenience method to obtain the bonding slaves defined in the file + # + # @return [Array] bonding slaves defined in the file + def slaves + return [] unless file.bonding_slaves + + file.bonding_slaves.map do |_id, name| + name + end + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb b/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb new file mode 100644 index 000000000..60d5fad4e --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb @@ -0,0 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Bonding + # object to the underlying system. + class Bonding < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + # @param conn [Y2Network::ConnectionConfig::Bonding] Configuration to write + def update_file(conn) + file.bonding_slaves = file_slaves(conn) + file.bonding_module_opts = conn.options + end + + # Convenience method to obtain the map of bonding slaves in the file + # format + # + # @return [Hash] indexed bonding slaves + def file_slaves(conn) + {}.tap do |h| + conn.slaves.each_with_index { |name, i| h[i] = name } + end + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index eeb5c1715..39c24f8e0 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -254,6 +254,17 @@ def variable_name(param_name) # @return [String] VLAN ID define_variable(:vlan_id, :integer) + ## BONDING + + # @!attribute [r] bonding_slaves + # @return [Hash] Bonding slaves + define_collection_variable(:bonding_slave) + + # @!attribute [r] bonding_module_opts + # @return [String] options for the bonding module ('mode=active-backup + # miimon=100') + define_variable(:bonding_module_opts) + ## BRIDGE # @!attribute [r] bridge diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-bond0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-bond0 new file mode 100644 index 000000000..11e58e988 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-bond0 @@ -0,0 +1,6 @@ +STARTMODE=auto +BOOTPROTO=static +IPADDR=192.168.20.100/24 +BONDING_SLAVE1=eth0 +BONDING_SLAVE2=eth1 +BONDING_MODULE_OPTS='mode=active-backup miimon=100' diff --git a/test/y2network/sysconfig/connection_config_readers/bonding_test.rb b/test/y2network/sysconfig/connection_config_readers/bonding_test.rb new file mode 100644 index 000000000..ae0f6bdae --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/bonding_test.rb @@ -0,0 +1,46 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/bonding" +require "y2network/sysconfig/interface_file" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Bonding do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "bond0" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a bonding connection config object" do + bonding_conn = handler.connection_config + expect(bonding_conn.interface).to eq("bond0") + expect(bonding_conn.slaves).to eq(["eth0", "eth1"]) + expect(bonding_conn.options).to eq("mode=active-backup miimon=100") + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/bonding_test.rb b/test/y2network/sysconfig/connection_config_writers/bonding_test.rb new file mode 100644 index 000000000..8697b0bb3 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/bonding_test.rb @@ -0,0 +1,63 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/bonding" +require "y2network/sysconfig/interface_file" +require "y2network/startmode" +require "y2network/connection_config/bonding" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Bonding do + subject(:handler) { described_class.new(file) } + + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Bonding, + name: "bond0", + interface: "bond0", + description: "", + ip_configs: [], + startmode: Y2Network::Startmode.create("auto"), + bootproto: Y2Network::BootProtocol::DHCP, + slaves: ["eth0", "eth1"], + options: "mode=active-backup miimon=100" + ) + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + startmode: "auto", + bootproto: "dhcp" + ) + end + + it "writes bonding properties" do + handler.write(conn) + expect(file).to have_attributes( + bonding_slaves: { 0 => "eth0", 1 => "eth1" }, + bonding_module_opts: "mode=active-backup miimon=100" + ) + end + end +end From 745179c225ca7749961e2f61b08821f7a94c58e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 31 Jul 2019 09:25:04 +0100 Subject: [PATCH 131/471] Remove unnecesary code from tests --- .../connection_config_writers/bridge_test.rb | 16 ---------------- .../connection_config_writers/dummy_test.rb | 5 ----- .../connection_config_writers/ethernet_test.rb | 5 ----- .../connection_config_writers/infiniband_test.rb | 5 ----- .../connection_config_writers/vlan_test.rb | 16 ---------------- 5 files changed, 47 deletions(-) diff --git a/test/y2network/sysconfig/connection_config_writers/bridge_test.rb b/test/y2network/sysconfig/connection_config_writers/bridge_test.rb index fc1a9d0df..7ecd48473 100644 --- a/test/y2network/sysconfig/connection_config_writers/bridge_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/bridge_test.rb @@ -28,22 +28,6 @@ describe Y2Network::Sysconfig::ConnectionConfigWriters::Bridge do subject(:handler) { described_class.new(file) } - def file_content(scr_root, file) - path = File.join(scr_root, file.path.to_s) - File.read(path) - end - - let(:scr_root) { Dir.mktmpdir } - - around do |example| - begin - FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) - change_scr_root(scr_root, &example) - ensure - FileUtils.remove_entry(scr_root) - end - end - let(:conn) do instance_double( Y2Network::ConnectionConfig::Bridge, diff --git a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb index 39f0cbd0f..bbee82106 100644 --- a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb @@ -28,11 +28,6 @@ describe Y2Network::Sysconfig::ConnectionConfigWriters::Dummy do subject(:handler) { described_class.new(file) } - def file_content(scr_root, file) - path = File.join(scr_root, file.path.to_s) - File.read(path) - end - let(:scr_root) { Dir.mktmpdir } around do |example| diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index 46326f088..99dc22a31 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -29,11 +29,6 @@ describe Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet do subject(:handler) { described_class.new(file) } - def file_content(scr_root, file) - path = File.join(scr_root, file.path.to_s) - File.read(path) - end - let(:scr_root) { Dir.mktmpdir } around do |example| diff --git a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb index ba2b9374a..b8445ae2b 100644 --- a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb @@ -29,11 +29,6 @@ describe Y2Network::Sysconfig::ConnectionConfigWriters::Infiniband do subject(:handler) { described_class.new(file) } - def file_content(scr_root, file) - path = File.join(scr_root, file.path.to_s) - File.read(path) - end - let(:scr_root) { Dir.mktmpdir } around do |example| diff --git a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb index 8ac210886..f8d83e2d1 100644 --- a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb @@ -29,22 +29,6 @@ describe Y2Network::Sysconfig::ConnectionConfigWriters::Vlan do subject(:handler) { described_class.new(file) } - def file_content(scr_root, file) - path = File.join(scr_root, file.path.to_s) - File.read(path) - end - - let(:scr_root) { Dir.mktmpdir } - - around do |example| - begin - FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) - change_scr_root(scr_root, &example) - ensure - FileUtils.remove_entry(scr_root) - end - end - let(:conn) do instance_double( Y2Network::ConnectionConfig::Vlan, From f421d9261ce711c674293586f9d2559025484cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 31 Jul 2019 11:29:35 +0100 Subject: [PATCH 132/471] Changes based on CR. --- .../sysconfig/connection_config_readers/bonding.rb | 6 +----- .../sysconfig/connection_config_writers/bonding.rb | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb b/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb index ef4d24c57..96a86a317 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb @@ -37,11 +37,7 @@ def update_connection_config(conn) # # @return [Array] bonding slaves defined in the file def slaves - return [] unless file.bonding_slaves - - file.bonding_slaves.map do |_id, name| - name - end + (file.bonding_slaves || {}).values end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb b/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb index 60d5fad4e..a48a45214 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb @@ -39,9 +39,7 @@ def update_file(conn) # # @return [Hash] indexed bonding slaves def file_slaves(conn) - {}.tap do |h| - conn.slaves.each_with_index { |name, i| h[i] = name } - end + conn.slaves.each_with_index.with_object({}) { |(name, i), h| h[i] = name } end end end From 51e25f90e5ad4cad7c07cb6ca13d5696d5c40faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 30 Jul 2019 15:16:07 +0100 Subject: [PATCH 133/471] Split ConnectionConfig::Base#ip_configs into different methods * #ip refers to the default IP; #ip_aliases refers to IP aliases. --- src/lib/y2network/connection_config/base.rb | 15 +++++++-- .../connection_config_readers/base.rb | 7 ++-- .../y2network/sysconfig/config_writer_test.rb | 4 +-- .../connection_config_readers/dummy_test.rb | 2 +- .../ethernet_test.rb | 6 ++-- .../connection_config_writers/dummy_test.rb | 10 ++---- .../infiniband_test.rb | 10 ++---- .../wireless_test.rb | 32 ++++++++++--------- 8 files changed, 44 insertions(+), 42 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 8ca22bc4c..fc2902551 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -42,8 +42,10 @@ class Base attr_accessor :interface # @return [BootProtocol] Bootproto attr_accessor :bootproto - # @return [Array] - attr_accessor :ip_configs + # @return [IPConfig] Primary IP configuration + attr_accessor :ip + # @return [Array] Additional IP configurations (also known as 'aliases') + attr_accessor :ip_aliases # @return [Integer, nil] attr_accessor :mtu # @return [Startmode, nil] @@ -53,7 +55,7 @@ class Base # Constructor def initialize - @ip_configs = [] + @ip_aliases = [] @bootproto = BootProtocol::STATIC @startmode = Startmode.create("manual") end @@ -75,6 +77,13 @@ def type def virtual? false end + + # Returns all IP configurations + # + # @return [Array] + def ip_configs + ([ip] + ip_aliases).compact + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index ce5b35341..46835d4e1 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -48,7 +48,8 @@ def connection_config conn.bootproto = BootProtocol.from_name(file.bootproto || "static") conn.description = file.name conn.interface = file.interface - conn.ip_configs = ip_configs + conn.ip = ip_configs.find { |i| i.id.empty? } + conn.ip_aliases = ip_configs.reject { |i| i.id.empty? } conn.name = file.interface conn.startmode = Startmode.create(file.startmode || "manual") conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" @@ -82,7 +83,7 @@ def update_connection_config(_conn) # @return [Array] IP addresses configuration # @see Y2Network::ConnectionConfig::IPConfig def ip_configs - configs = file.ipaddrs.map do |id, ip| + @ip_configs ||= configs = file.ipaddrs.map do |id, ip| next unless ip.is_a?(Y2Network::IPAddress) ip_address = build_ip(ip, file.prefixlens[id], file.netmasks[id]) Y2Network::ConnectionConfig::IPConfig.new( @@ -93,8 +94,6 @@ def ip_configs broadcast: file.broadcasts[id] ) end - # The one without suffix comes first. - configs.compact.sort_by { |c| c.id.nil? ? -1 : 0 } end # Builds an IP address diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 29f40dd3b..9226df92e 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -40,13 +40,13 @@ ) end let(:old_config) { instance_double(Y2Network::Config, dns: double("dns"), interfaces: nil) } - let(:ip_config) { Y2Network::ConnectionConfig::IPConfig.new(address: IPAddr.new("192.168.122.2")) } + let(:ip) { Y2Network::ConnectionConfig::IPConfig.new(address: IPAddr.new("192.168.122.2")) } let(:eth0) { Y2Network::Interface.new("eth0") } let(:eth0_conn) do Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| conn.interface = "eth0" conn.bootproto = :static - conn.ip_configs = [ip_config] + conn.ip = ip end end let(:route) do diff --git a/test/y2network/sysconfig/connection_config_readers/dummy_test.rb b/test/y2network/sysconfig/connection_config_readers/dummy_test.rb index e9f6faeac..a99158fe7 100644 --- a/test/y2network/sysconfig/connection_config_readers/dummy_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/dummy_test.rb @@ -41,7 +41,7 @@ it "returns a dummy connection config object" do dummy_conn = handler.connection_config expect(dummy_conn.interface).to eq("dummy0") - expect(dummy_conn.ip_configs.map(&:address)).to eq([ip_address]) + expect(dummy_conn.ip.address).to eq(ip_address) expect(dummy_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) end end diff --git a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb index f58800d58..98d8783bf 100644 --- a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb @@ -40,7 +40,7 @@ it "returns an ethernet connection config object" do eth = handler.connection_config expect(eth.interface).to eq("eth0") - expect(eth.ip_configs.map(&:address)).to eq([Y2Network::IPAddress.from_string("192.168.123.1/24")]) + expect(eth.ip.address).to eq(Y2Network::IPAddress.from_string("192.168.123.1/24")) expect(eth.bootproto).to eq(Y2Network::BootProtocol::STATIC) end @@ -49,7 +49,7 @@ it "uses the prefixlen as the address prefix" do eth = handler.connection_config - expect(eth.ip_configs.map(&:address)).to eq([Y2Network::IPAddress.from_string("172.16.0.1/12")]) + expect(eth.ip.address).to eq(Y2Network::IPAddress.from_string("172.16.0.1/12")) end end @@ -58,7 +58,7 @@ it "uses the netmask to set the address prefix" do eth = handler.connection_config - expect(eth.ip_configs.map(&:address)).to eq([Y2Network::IPAddress.from_string("10.0.0.1/8")]) + expect(eth.ip.address).to eq(Y2Network::IPAddress.from_string("10.0.0.1/8")) end end end diff --git a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb index bbee82106..824e44269 100644 --- a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb @@ -39,12 +39,8 @@ end end - let(:ip_configs) do - [ - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.100/24") - ) - ] + let(:ip) do + Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.from_string("10.0.0.100/24")) end let(:conn) do @@ -54,7 +50,7 @@ interface: "dummy1", description: "", bootproto: Y2Network::BootProtocol::STATIC, - ip_configs: ip_configs, + ip_configs: [ip], startmode: Y2Network::Startmode.create("auto") ) end diff --git a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb index b8445ae2b..a1d222b18 100644 --- a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb @@ -40,12 +40,8 @@ end end - let(:ip_configs) do - [ - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.20.1/24") - ) - ] + let(:ip) do + Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.from_string("192.168.20.1/24")) end let(:conn) do @@ -55,7 +51,7 @@ interface: "ib0", description: "", ipoib_mode: Y2Network::IpoibMode::CONNECTED, - ip_configs: ip_configs, + ip_configs: [ip], startmode: Y2Network::Startmode.create("auto"), bootproto: Y2Network::BootProtocol::STATIC ) diff --git a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb index 7215925cf..abb54e6e5 100644 --- a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb @@ -35,7 +35,8 @@ conn.description = "Wireless Card 0" conn.startmode = Y2Network::Startmode.create("auto") conn.bootproto = Y2Network::BootProtocol::STATIC - conn.ip_configs = ip_configs + conn.ip = ip + conn.ip_aliases = [ip_alias] conn.mode = "managed" conn.essid = "example_essid" conn.auth_mode = :open @@ -44,17 +45,18 @@ end end - let(:ip_configs) do - [ - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.122.1/24"), - id: "", broadcast: Y2Network::IPAddress.from_string("192.168.122.255") - ), - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.1/8"), - id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") - ) - ] + let(:ip) do + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("192.168.122.1/24"), + id: "", broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + ) + end + + let(:ip_alias) do + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.1/8"), + id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") + ) end it "sets relevant attributes" do @@ -73,9 +75,9 @@ it "sets IP configuration attributes" do handler.write(conn) expect(file).to have_attributes( - ipaddrs: { "" => ip_configs[0].address, "_0" => ip_configs[1].address }, - broadcasts: { "" => ip_configs[0].broadcast, "_0" => nil }, - remote_ipaddrs: { "" => nil, "_0" => ip_configs[1].remote_address }, + ipaddrs: { "" => ip.address, "_0" => ip_alias.address }, + broadcasts: { "" => ip.broadcast, "_0" => nil }, + remote_ipaddrs: { "" => nil, "_0" => ip_alias.remote_address }, labels: { "" => nil, "_0" => "my-label" } ) end From 15b6d1417a427d2409fd572034dca5421e03eb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 30 Jul 2019 15:17:20 +0100 Subject: [PATCH 134/471] Adapt InterfaceConfigBuilder to use the #ip and #ip_aliases methods --- src/lib/y2network/interface_config_builder.rb | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 40ff90002..252a67702 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -253,7 +253,7 @@ def aliases } end - new_aliases = @connection_config.ip_configs.select { |c| c.id != "" }.map do |data| + new_aliases = @connection_config.ip_aliases.map do |data| { label: data.label, ip: data.address.address, @@ -269,9 +269,7 @@ def aliases def aliases=(value) @aliases = value - # connection config - # keep only default as aliases does not handle default ip config - @connection_config.ip_configs.delete_if { |c| c.id != "" } + @connection_config.ip_aliases.clear value.each_with_index do |h, i| ip_addr = IPAddress.from_string(h[:ip]) if h[:prefixlen] && !h[:prefixlen].empty? @@ -279,7 +277,7 @@ def aliases=(value) elsif h[:mask] && !h[:mask].empty? ip.netmask = h[:mask] end - @connection_config.ip_configs << ConnectionConfig::IPConfig.new( + @connection_config.ip_aliases << ConnectionConfig::IPConfig.new( ip_addr, label: h[:label], id: "_#{i}" # TODO: remember original prefixes @@ -308,8 +306,7 @@ def ethtool_options=(value) def ip_address old = @config["IPADDR"] - # FIXME: workaround to remove when primary ip config is separated from the rest - default = (@connection_config.ip_configs || []).find { |c| c.id == "" } + default = @connection_config.ip new_ = if default default.address.address else @@ -321,11 +318,8 @@ def ip_address # @param [String] value def ip_address=(value) @config["IPADDR"] = value - - # connection_config if value.nil? || value.empty? - # in such case remove default config - @connection_config.ip_configs.delete_if { |c| c.id == "" } + @connection_config.ip = nil else ip_config_default.address.address = value end @@ -338,9 +332,8 @@ def subnet_prefix else @config["NETMASK"] || "" end - default = (@connection_config.ip_configs || []).find { |c| c.id == "" } - new_ = if default - "/" + default.address.prefix.to_s + new_ = if @connection_config.ip + "/" + @connection_config.ip.address.prefix.to_s else "" end @@ -384,7 +377,7 @@ def hostname=(value) # @return [String] def remote_ip old = @config["REMOTEIP"] - default = @connection_config.ip_configs.find { |c| c.id == "" } + default = @connection_config.ip new_ = if default default.remote_address.to_s else @@ -576,12 +569,8 @@ def save_aliases end def ip_config_default - default = @connection_config.ip_configs.find { |c| c.id == "" } - if !default - default = ConnectionConfig::IPConfig.new(IPAddress.new("0.0.0.0")) # fake ip as it will be replaced soon - @connection_config.ip_configs << default - end - default + return @connection_config.ip if @connection_config.ip + @connection_config.ip = ConnectionConfig::IPConfig.new(IPAddress.new("0.0.0.0")) end # method that allows easy change of backend for providing data From 2a181d15ed35808a60953406b5d39b38e67ce63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 30 Jul 2019 15:28:33 +0100 Subject: [PATCH 135/471] Rename ConnectionConfig::Base#ip_configs to #all_ips --- src/lib/y2network/connection_config/base.rb | 2 +- .../connection_config_readers/base.rb | 8 ++--- .../connection_config_writers/base.rb | 8 ++--- .../infiniband_test.rb | 2 +- .../connection_config_writers/dummy_test.rb | 2 +- .../ethernet_test.rb | 33 ++++++++++--------- .../infiniband_test.rb | 2 +- .../connection_config_writers/vlan_test.rb | 2 +- 8 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index fc2902551..16463c46b 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -81,7 +81,7 @@ def virtual? # Returns all IP configurations # # @return [Array] - def ip_configs + def all_ips ([ip] + ip_aliases).compact end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 46835d4e1..964db81b3 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -48,8 +48,8 @@ def connection_config conn.bootproto = BootProtocol.from_name(file.bootproto || "static") conn.description = file.name conn.interface = file.interface - conn.ip = ip_configs.find { |i| i.id.empty? } - conn.ip_aliases = ip_configs.reject { |i| i.id.empty? } + conn.ip = all_ips.find { |i| i.id.empty? } + conn.ip_aliases = all_ips.reject { |i| i.id.empty? } conn.name = file.interface conn.startmode = Startmode.create(file.startmode || "manual") conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" @@ -82,8 +82,8 @@ def update_connection_config(_conn) # # @return [Array] IP addresses configuration # @see Y2Network::ConnectionConfig::IPConfig - def ip_configs - @ip_configs ||= configs = file.ipaddrs.map do |id, ip| + def all_ips + @all_ips ||= file.ipaddrs.map do |id, ip| next unless ip.is_a?(Y2Network::IPAddress) ip_address = build_ip(ip, file.prefixlens[id], file.netmasks[id]) Y2Network::ConnectionConfig::IPConfig.new( diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index adcf88ee8..7ed9e8bbc 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -44,7 +44,7 @@ def write(conn) file.name = conn.description file.startmode = conn.startmode.to_s file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" - write_ip_configs(conn.ip_configs) + write_all_ips(conn.all_ips) update_file(conn) end @@ -61,9 +61,9 @@ def update_file(_conn) # Write IP configuration # - # @param ip_configs [Array] IPs configuration - def write_ip_configs(ip_configs) - ip_configs.each do |ip_config| + # @param all_ips [Array] IPs configuration + def write_all_ips(all_ips) + all_ips.each do |ip_config| file.ipaddrs[ip_config.id] = ip_config.address file.labels[ip_config.id] = ip_config.label file.remote_ipaddrs[ip_config.id] = ip_config.remote_address diff --git a/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb index 3e4f52fcf..357c297d8 100644 --- a/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb @@ -42,7 +42,7 @@ infiniband_conn = handler.connection_config expect(infiniband_conn.interface).to eq("ib0") expect(infiniband_conn.ipoib_mode).to eq(Y2Network::IpoibMode::DATAGRAM) - expect(infiniband_conn.ip_configs.map(&:address)).to eq([ip_address]) + expect(infiniband_conn.all_ips.map(&:address)).to eq([ip_address]) expect(infiniband_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) end end diff --git a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb index 824e44269..aa0f855e9 100644 --- a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb @@ -50,7 +50,7 @@ interface: "dummy1", description: "", bootproto: Y2Network::BootProtocol::STATIC, - ip_configs: [ip], + all_ips: [ip], startmode: Y2Network::Startmode.create("auto") ) end diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index 99dc22a31..344e940eb 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -40,19 +40,22 @@ end end - let(:ip_configs) do - [ - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.122.1/24"), - id: "", broadcast: Y2Network::IPAddress.from_string("192.168.122.255") - ), - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.1/8"), - id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") - ) - ] + let(:ip) do + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("192.168.122.1/24"), + id: "", broadcast: Y2Network::IPAddress.from_string("192.168.122.255") + ) + end + + let(:ip_alias) do + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.1/8"), + id: "_0", label: "my-label", remote_address: Y2Network::IPAddress.from_string("10.0.0.2") + ) end + let(:all_ips) { [ip, ip_alias] } + let(:conn) do instance_double( Y2Network::ConnectionConfig::Ethernet, @@ -60,7 +63,7 @@ interface: "eth0", description: "Ethernet Card 0", bootproto: Y2Network::BootProtocol::STATIC, - ip_configs: ip_configs, + all_ips: all_ips, startmode: Y2Network::Startmode.create("auto") ) end @@ -80,9 +83,9 @@ it "sets IP configuration attributes" do handler.write(conn) expect(file).to have_attributes( - ipaddrs: { "" => ip_configs[0].address, "_0" => ip_configs[1].address }, - broadcasts: { "" => ip_configs[0].broadcast, "_0" => nil }, - remote_ipaddrs: { "" => nil, "_0" => ip_configs[1].remote_address }, + ipaddrs: { "" => ip.address, "_0" => ip_alias.address }, + broadcasts: { "" => ip.broadcast, "_0" => nil }, + remote_ipaddrs: { "" => nil, "_0" => ip_alias.remote_address }, labels: { "" => nil, "_0" => "my-label" } ) end diff --git a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb index a1d222b18..f1f671034 100644 --- a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb @@ -51,7 +51,7 @@ interface: "ib0", description: "", ipoib_mode: Y2Network::IpoibMode::CONNECTED, - ip_configs: [ip], + all_ips: [ip], startmode: Y2Network::Startmode.create("auto"), bootproto: Y2Network::BootProtocol::STATIC ) diff --git a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb index f8d83e2d1..1a1910ed3 100644 --- a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb @@ -37,7 +37,7 @@ description: "", parent_device: "eth0", vlan_id: 100, - ip_configs: [], + all_ips: [], startmode: Y2Network::Startmode.create("auto"), bootproto: Y2Network::BootProtocol::DHCP ) From 82c4c433437ac2d0376eaf5ed97667b5cf30d569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 31 Jul 2019 16:15:10 +0100 Subject: [PATCH 136/471] Fix primary IP reading/writing --- .../connection_config_readers/base.rb | 4 +-- .../connection_config_writers/base.rb | 28 ++++++++++------- .../ethernet_test.rb | 30 +++++++++++++------ 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 964db81b3..1df6b3208 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -83,10 +83,10 @@ def update_connection_config(_conn) # @return [Array] IP addresses configuration # @see Y2Network::ConnectionConfig::IPConfig def all_ips - @all_ips ||= file.ipaddrs.map do |id, ip| + @all_ips ||= file.ipaddrs.each_with_object([]) do |(id, ip), all| next unless ip.is_a?(Y2Network::IPAddress) ip_address = build_ip(ip, file.prefixlens[id], file.netmasks[id]) - Y2Network::ConnectionConfig::IPConfig.new( + all << Y2Network::ConnectionConfig::IPConfig.new( ip_address, id: id, label: file.labels[id], diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index 7ed9e8bbc..0e2252d65 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -44,7 +44,7 @@ def write(conn) file.name = conn.description file.startmode = conn.startmode.to_s file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" - write_all_ips(conn.all_ips) + add_ips(conn) update_file(conn) end @@ -59,16 +59,24 @@ def update_file(_conn) raise NotImplementedError end - # Write IP configuration + # Adds IP addresses # - # @param all_ips [Array] IPs configuration - def write_all_ips(all_ips) - all_ips.each do |ip_config| - file.ipaddrs[ip_config.id] = ip_config.address - file.labels[ip_config.id] = ip_config.label - file.remote_ipaddrs[ip_config.id] = ip_config.remote_address - file.broadcasts.merge!(ip_config.id => ip_config.broadcast) - end + # @param conn [Y2Network::ConnectionConfig::Base] Connection to take settings from + def add_ips(conn) + file.ipaddrs.clear + ips_to_add = conn.ip_aliases.clone + ips_to_add << conn.ip if conn.ip && !conn.bootproto.dhcp? + ips_to_add.each { |i| add_ip(i) } + end + + # Adds a single IP to the file + # + # @param ip [Y2Network::IPAddress] IP address to add + def add_ip(ip) + file.ipaddrs[ip.id] = ip.address + file.labels[ip.id] = ip.label + file.remote_ipaddrs[ip.id] = ip.remote_address + file.broadcasts[ip.id] = ip.broadcast end end end diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index 344e940eb..d9e8a6fcb 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -57,15 +57,15 @@ let(:all_ips) { [ip, ip_alias] } let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Ethernet, - name: "eth0", - interface: "eth0", - description: "Ethernet Card 0", - bootproto: Y2Network::BootProtocol::STATIC, - all_ips: all_ips, - startmode: Y2Network::Startmode.create("auto") - ) + Y2Network::ConnectionConfig::Ethernet.new.tap do |c| + c.name = "eth0" + c.interface = "eth0" + c.description = "Ethernet Card 0" + c.bootproto = Y2Network::BootProtocol::STATIC + c.ip = ip + c.ip_aliases = [ip_alias] + c.startmode = Y2Network::Startmode.create("auto") + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.find(conn.interface) } @@ -89,5 +89,17 @@ labels: { "" => nil, "_0" => "my-label" } ) end + + context "when using dhcp" do + before do + conn.bootproto = Y2Network::BootProtocol::DHCP + end + + it "only writes ip aliases" do + handler.write(conn) + expect(file.ipaddrs[""]).to be_nil + expect(file.ipaddrs["_0"]).to eq(ip_alias.address) + end + end end end From 0d455ddd2769c8ad52f0f833d9297cd71ef4a00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 31 Jul 2019 16:15:46 +0100 Subject: [PATCH 137/471] Use real connections objects in writers tests --- .../connection_config_writers/bonding_test.rb | 20 +++--- .../connection_config_writers/bridge_test.rb | 22 +++--- .../connection_config_writers/dummy_test.rb | 17 +++-- .../infiniband_test.rb | 19 +++-- .../connection_config_writers/tap_test.rb | 20 +++--- .../connection_config_writers/tun_test.rb | 20 +++--- .../connection_config_writers/vlan_test.rb | 20 +++--- .../wireless_test.rb | 70 +++++++++---------- 8 files changed, 98 insertions(+), 110 deletions(-) diff --git a/test/y2network/sysconfig/connection_config_writers/bonding_test.rb b/test/y2network/sysconfig/connection_config_writers/bonding_test.rb index 8697b0bb3..0eb76f04e 100644 --- a/test/y2network/sysconfig/connection_config_writers/bonding_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/bonding_test.rb @@ -28,17 +28,15 @@ subject(:handler) { described_class.new(file) } let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Bonding, - name: "bond0", - interface: "bond0", - description: "", - ip_configs: [], - startmode: Y2Network::Startmode.create("auto"), - bootproto: Y2Network::BootProtocol::DHCP, - slaves: ["eth0", "eth1"], - options: "mode=active-backup miimon=100" - ) + Y2Network::ConnectionConfig::Bonding.new.tap do |c| + c.name = "bond0" + c.interface = "bond0" + c.description = "" + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::DHCP + c.slaves = ["eth0", "eth1"] + c.options = "mode=active-backup miimon=100" + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } diff --git a/test/y2network/sysconfig/connection_config_writers/bridge_test.rb b/test/y2network/sysconfig/connection_config_writers/bridge_test.rb index 7ecd48473..8dd861f74 100644 --- a/test/y2network/sysconfig/connection_config_writers/bridge_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/bridge_test.rb @@ -29,18 +29,16 @@ subject(:handler) { described_class.new(file) } let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Bridge, - name: "br1", - interface: "br1", - description: "", - startmode: Y2Network::Startmode.create("auto"), - bootproto: Y2Network::BootProtocol::DHCP, - ip_configs: [], - ports: ["eth0", "eth1"], - stp: false, - forward_delay: 5 - ) + Y2Network::ConnectionConfig::Bridge.new.tap do |c| + c.name = "br1" + c.interface = "br1" + c.description = "" + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::DHCP + c.ports = ["eth0", "eth1"] + c.stp = false + c.forward_delay = 5 + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } diff --git a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb index aa0f855e9..aa4a9665e 100644 --- a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/dummy_test.rb @@ -44,15 +44,14 @@ end let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Dummy, - name: "dummy1", - interface: "dummy1", - description: "", - bootproto: Y2Network::BootProtocol::STATIC, - all_ips: [ip], - startmode: Y2Network::Startmode.create("auto") - ) + Y2Network::ConnectionConfig::Dummy.new.tap do |c| + c.name = "dummy1" + c.interface = "dummy1" + c.description = "" + c.ip = ip + c.bootproto = Y2Network::BootProtocol::STATIC + c.startmode = Y2Network::Startmode.create("auto") + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } diff --git a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb index f1f671034..06c614552 100644 --- a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb @@ -45,16 +45,15 @@ end let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Infiniband, - name: "ib0", - interface: "ib0", - description: "", - ipoib_mode: Y2Network::IpoibMode::CONNECTED, - all_ips: [ip], - startmode: Y2Network::Startmode.create("auto"), - bootproto: Y2Network::BootProtocol::STATIC - ) + Y2Network::ConnectionConfig::Infiniband.new.tap do |c| + c.name = "ib0" + c.interface = "ib0" + c.description = "" + c.ipoib_mode = Y2Network::IpoibMode::CONNECTED + c.ip = ip + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::STATIC + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } diff --git a/test/y2network/sysconfig/connection_config_writers/tap_test.rb b/test/y2network/sysconfig/connection_config_writers/tap_test.rb index 9323a5edf..00b985ade 100644 --- a/test/y2network/sysconfig/connection_config_writers/tap_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/tap_test.rb @@ -45,17 +45,15 @@ def file_content(scr_root, file) end let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Tap, - name: "tap1", - interface: "tap1", - owner: "nobody", - group: "nobody", - description: "", - bootproto: Y2Network::BootProtocol::STATIC, - ip_configs: [], - startmode: Y2Network::Startmode.create("auto") - ) + Y2Network::ConnectionConfig::Tap.new.tap do |c| + c.name = "tap1" + c.interface = "tap1" + c.owner = "nobody" + c.group = "nobody" + c.description = "" + c.bootproto = Y2Network::BootProtocol::STATIC + c.startmode = Y2Network::Startmode.create("auto") + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } diff --git a/test/y2network/sysconfig/connection_config_writers/tun_test.rb b/test/y2network/sysconfig/connection_config_writers/tun_test.rb index 2511fde66..86cefa30d 100644 --- a/test/y2network/sysconfig/connection_config_writers/tun_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/tun_test.rb @@ -45,17 +45,15 @@ def file_content(scr_root, file) end let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Tun, - name: "tun1", - interface: "tun1", - owner: "nobody", - group: "nobody", - description: "", - bootproto: Y2Network::BootProtocol::STATIC, - ip_configs: [], - startmode: Y2Network::Startmode.create("auto") - ) + Y2Network::ConnectionConfig::Tun.new.tap do |c| + c.name = "tun1" + c.interface = "tun1" + c.owner = "nobody" + c.group = "nobody" + c.description = "" + c.bootproto = Y2Network::BootProtocol::STATIC + c.startmode = Y2Network::Startmode.create("auto") + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } diff --git a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb index 1a1910ed3..4d46231fd 100644 --- a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb @@ -30,17 +30,15 @@ subject(:handler) { described_class.new(file) } let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Vlan, - name: "eth0.100", - interface: "eth0.100", - description: "", - parent_device: "eth0", - vlan_id: 100, - all_ips: [], - startmode: Y2Network::Startmode.create("auto"), - bootproto: Y2Network::BootProtocol::DHCP - ) + Y2Network::ConnectionConfig::Vlan.new.tap do |c| + c.name = "eth0.100" + c.interface = "eth0.100" + c.description = "" + c.parent_device = "eth0" + c.vlan_id = 100 + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::DHCP + end end let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } diff --git a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb index abb54e6e5..8b76955e7 100644 --- a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/wireless_test.rb @@ -30,18 +30,18 @@ let(:file) { Y2Network::Sysconfig::InterfaceFile.new("wlan0") } let(:conn) do - Y2Network::ConnectionConfig::Wireless.new.tap do |conn| - conn.interface = "wlan0" - conn.description = "Wireless Card 0" - conn.startmode = Y2Network::Startmode.create("auto") - conn.bootproto = Y2Network::BootProtocol::STATIC - conn.ip = ip - conn.ip_aliases = [ip_alias] - conn.mode = "managed" - conn.essid = "example_essid" - conn.auth_mode = :open - conn.ap = "00:11:22:33:44:55" - conn.ap_scanmode = "1" + Y2Network::ConnectionConfig::Wireless.new.tap do |c| + c.interface = "wlan0" + c.description = "Wireless Card 0" + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::STATIC + c.ip = ip + c.ip_aliases = [ip_alias] + c.mode = "managed" + c.essid = "example_essid" + c.auth_mode = :open + c.ap = "00:11:22:33:44:55" + c.ap_scanmode = "1" end end @@ -84,15 +84,15 @@ context "WPA-EAP network configuration" do let(:conn) do - Y2Network::ConnectionConfig::Wireless.new.tap do |conn| - conn.startmode = Y2Network::Startmode.create("auto") - conn.bootproto = Y2Network::BootProtocol::STATIC - conn.mode = "managed" - conn.essid = "example_essid" - conn.auth_mode = "eap" - conn.eap_mode = "PEAP" - conn.essid = "example_essid" - conn.wpa_password = "example_passwd" + Y2Network::ConnectionConfig::Wireless.new.tap do |c| + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::STATIC + c.mode = "managed" + c.essid = "example_essid" + c.auth_mode = "eap" + c.eap_mode = "PEAP" + c.essid = "example_essid" + c.wpa_password = "example_passwd" end end @@ -109,12 +109,12 @@ context "WPA-PSK network configuration" do let(:conn) do - Y2Network::ConnectionConfig::Wireless.new.tap do |conn| - conn.startmode = Y2Network::Startmode.create("auto") - conn.bootproto = Y2Network::BootProtocol::STATIC - conn.mode = "managed" - conn.auth_mode = "psk" - conn.wpa_psk = "example_psk" + Y2Network::ConnectionConfig::Wireless.new.tap do |c| + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::STATIC + c.mode = "managed" + c.auth_mode = "psk" + c.wpa_psk = "example_psk" end end @@ -129,14 +129,14 @@ context "WEP network configuration" do let(:conn) do - Y2Network::ConnectionConfig::Wireless.new.tap do |conn| - conn.startmode = Y2Network::Startmode.create("auto") - conn.bootproto = Y2Network::BootProtocol::STATIC - conn.mode = "managed" - conn.auth_mode = "shared" - conn.keys = ["123456", "abcdef"] - conn.key_length = 128 - conn.default_key = 1 + Y2Network::ConnectionConfig::Wireless.new.tap do |c| + c.startmode = Y2Network::Startmode.create("auto") + c.bootproto = Y2Network::BootProtocol::STATIC + c.mode = "managed" + c.auth_mode = "shared" + c.keys = ["123456", "abcdef"] + c.key_length = 128 + c.default_key = 1 end end From 90d97d7a45288042d21add8c210228e277fd8715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 31 Jul 2019 16:16:12 +0100 Subject: [PATCH 138/471] Add missing calls to super --- src/lib/y2network/connection_config/bonding.rb | 1 + src/lib/y2network/connection_config/bridge.rb | 1 + src/lib/y2network/connection_config/tap.rb | 1 + src/lib/y2network/connection_config/tun.rb | 1 + 4 files changed, 4 insertions(+) diff --git a/src/lib/y2network/connection_config/bonding.rb b/src/lib/y2network/connection_config/bonding.rb index b5c6b6758..f136f13ca 100644 --- a/src/lib/y2network/connection_config/bonding.rb +++ b/src/lib/y2network/connection_config/bonding.rb @@ -31,6 +31,7 @@ class Bonding < Base attr_accessor :options def initialize + super() @slaves = [] @options = "" end diff --git a/src/lib/y2network/connection_config/bridge.rb b/src/lib/y2network/connection_config/bridge.rb index 75d2f5827..c94400ec8 100644 --- a/src/lib/y2network/connection_config/bridge.rb +++ b/src/lib/y2network/connection_config/bridge.rb @@ -33,6 +33,7 @@ class Bridge < Base attr_accessor :forward_delay def initialize + super() @ports = [] @stp = false @forward_delay = 0 diff --git a/src/lib/y2network/connection_config/tap.rb b/src/lib/y2network/connection_config/tap.rb index 13db44305..bf9e28d2d 100644 --- a/src/lib/y2network/connection_config/tap.rb +++ b/src/lib/y2network/connection_config/tap.rb @@ -29,6 +29,7 @@ class Tap < Base attr_accessor :group def initialize + super() @owner = "" @group = "" end diff --git a/src/lib/y2network/connection_config/tun.rb b/src/lib/y2network/connection_config/tun.rb index c206831be..458ccc651 100644 --- a/src/lib/y2network/connection_config/tun.rb +++ b/src/lib/y2network/connection_config/tun.rb @@ -29,6 +29,7 @@ class Tun < Base attr_accessor :group def initialize + super() @owner = "" @group = "" end From 30588dbd9c99ad04b2fcff6671648dc43e03befd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 31 Jul 2019 16:38:19 +0100 Subject: [PATCH 139/471] Fix aliases handling in additional addresses widget --- src/lib/y2network/interface_config_builder.rb | 37 +++++++++++-------- .../interface_config_builder_test.rb | 13 ++++++- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 252a67702..524c7637d 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -91,6 +91,7 @@ def save Yast::LanItems.driver_options[driver] = driver_options end + @connection_config.name = name @connection_config.interface = name Yast::Lan.yast_config.connections.add_or_update(@connection_config) @@ -261,28 +262,13 @@ def aliases # NOTE: new API does not have netmask at all, we need to adapt UI to clearly mention only prefix } end - select_backend(old_aliases, new_aliases) + @aliases = select_backend(old_aliases, new_aliases) end # sets aliases for interface # @param value [Array] see #aliases for hash values def aliases=(value) @aliases = value - - @connection_config.ip_aliases.clear - value.each_with_index do |h, i| - ip_addr = IPAddress.from_string(h[:ip]) - if h[:prefixlen] && !h[:prefixlen].empty? - ip_addr.prefix = h[:prefixlen].delete("/").to_i - elsif h[:mask] && !h[:mask].empty? - ip.netmask = h[:mask] - end - @connection_config.ip_aliases << ConnectionConfig::IPConfig.new( - ip_addr, - label: h[:label], - id: "_#{i}" # TODO: remember original prefixes - ) - end end # gets interface name that will be assigned by udev @@ -566,6 +552,7 @@ def save_aliases aliases_to_delete.each_pair do |a, v| Yast::NetworkInterfaces.DeleteAlias(Yast::NetworkInterfaces.Name, a) if v end + save_aliases_to_connection end def ip_config_default @@ -591,5 +578,23 @@ def connection_config_klass(type) log.error "Could not find a class to handle '#{type.name}' connections" ConnectionConfig::Base end + + # Saves aliases to current connection config object + def save_aliases_to_connection + @connection_config.ip_aliases.clear + aliases.each_with_index do |h, i| + ip_addr = IPAddress.from_string(h[:ip]) + if h[:prefixlen] && !h[:prefixlen].empty? + ip_addr.prefix = h[:prefixlen].delete("/").to_i + elsif h[:mask] && !h[:mask].empty? + ip_addr.netmask = h[:mask] + end + @connection_config.ip_aliases << ConnectionConfig::IPConfig.new( + ip_addr, + label: h[:label], + id: "_#{i}" # TODO: remember original prefixes + ) + end + end end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 1523e56df..63ea9e27f 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -38,7 +38,7 @@ end end - describe ".save" do + describe "#save" do around do |block| Yast::LanItems.AddNew # FIXME: workaround for device without reading hwinfo, so udev is not initialized @@ -60,7 +60,7 @@ subject.save end - it "stores aliases" do + it "stores aliases (old model)" do # Avoid deleting old aliases as it can break other tests, due to singleton NetworkInterfaces allow(Yast::NetworkInterfaces).to receive(:DeleteAlias) subject.aliases = [{ ip: "10.0.0.0", prefixlen: "24", label: "test", mask: "" }] @@ -69,6 +69,15 @@ 0 => { "IPADDR" => "10.0.0.0", "LABEL" => "test", "PREFIXLEN" => "24", "NETMASK" => "" } ) end + + it "stores aliases" do + subject.aliases = [{ ip: "10.0.0.0", prefixlen: "24", label: "test", mask: "" }] + subject.save + connection_config = Yast::Lan.yast_config.connections.by_name("eth0") + ip_alias = connection_config.ip_aliases.first + expect(ip_alias.address).to eq(Y2Network::IPAddress.new("10.0.0.0", 24)) + expect(ip_alias.label).to eq("test") + end end describe "#new_device_startmode" do From c6d8833b4a76f3e6c1b7e7e1375cf33d73d03963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 09:40:36 +0100 Subject: [PATCH 140/471] Improve ConnectionConfig #name and #interface documentation --- src/lib/y2network/connection_config/base.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 16463c46b..7a017e8c9 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -35,11 +35,12 @@ class Base # # @return [String] Connection name attr_accessor :name - # #FIXME: Maybe in the future it could be a matcher. By now we will use - # the interface name - # - # @return [String, nil] + + # @return [String, nil] Interface to apply the configuration to + # FIXME: Maybe in the future it could be a matcher. By now we will use + # the interface's name. attr_accessor :interface + # @return [BootProtocol] Bootproto attr_accessor :bootproto # @return [IPConfig] Primary IP configuration From 3a82784f68fd07af104c829afc59554e87e13807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 11:35:09 +0100 Subject: [PATCH 141/471] Fix interfaces file clean-up * Unused collection values are properly clean-up. --- src/lib/y2network/sysconfig/interface_file.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 684eb22c7..064f737ec 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -482,13 +482,15 @@ def write_collection(key, values) # # @param key [String] Key def clean_collection(key) - collection_keys(key).each { |k| write_scalar(k, "") } + collection_keys(key).each { |k| write_scalar(k, nil) } end # Writes the value for a given key # + # If the value is set to nil, the key will be removed. + # # @param key [Symbol] Key - # @param value [#to_s] Value to write + # @param value [#to_s,nil] Value to write def write_scalar(key, value) raw_value = value ? value.to_s : nil path = Yast::Path.new(".network.value.\"#{interface}\".#{key}") From 8d6fd9e78fbbffe9d6ede33e063968cedb3b0663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 1 Aug 2019 06:49:24 +0100 Subject: [PATCH 142/471] Add qeth connection config --- src/lib/y2network/connection_config/base.rb | 2 + src/lib/y2network/connection_config/qeth.rb | 28 ++++++++++ .../connection_config_readers/base.rb | 1 + .../connection_config_readers/qeth.rb | 31 +++++++++++ .../connection_config_writers/base.rb | 1 + .../connection_config_writers/qeth.rb | 31 +++++++++++ src/lib/y2network/sysconfig/interface_file.rb | 4 ++ .../scr_read/etc/sysconfig/network/ifcfg-eth5 | 4 ++ test/y2network/connection_config/qeth_test.rb | 30 +++++++++++ .../connection_config_readers/qeth_test.rb | 49 +++++++++++++++++ .../connection_config_writers/qeth_test.rb | 53 +++++++++++++++++++ 11 files changed, 234 insertions(+) create mode 100644 src/lib/y2network/connection_config/qeth.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/qeth.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/qeth.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-eth5 create mode 100644 test/y2network/connection_config/qeth_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/qeth_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/qeth_test.rb diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 7a017e8c9..d1d8d0721 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -53,6 +53,8 @@ class Base attr_accessor :startmode # @return [String] Connection's description (e.g., "Ethernet Card 0") attr_accessor :description + # @return [String] Link layer address + attr_accessor :lladdress # Constructor def initialize diff --git a/src/lib/y2network/connection_config/qeth.rb b/src/lib/y2network/connection_config/qeth.rb new file mode 100644 index 000000000..767963da7 --- /dev/null +++ b/src/lib/y2network/connection_config/qeth.rb @@ -0,0 +1,28 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for qeth connections + class Qeth < Base + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 1df6b3208..efb25e78b 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -51,6 +51,7 @@ def connection_config conn.ip = all_ips.find { |i| i.id.empty? } conn.ip_aliases = all_ips.reject { |i| i.id.empty? } conn.name = file.interface + conn.lladdress = file.lladdr conn.startmode = Startmode.create(file.startmode || "manual") conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" update_connection_config(conn) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb b/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb new file mode 100644 index 000000000..9dc140a82 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/ethernet" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Qeth object given a + # Sysconfig::InterfaceFile object. + class Qeth < Ethernet + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index 0e2252d65..f1dffb075 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -42,6 +42,7 @@ def initialize(file) def write(conn) file.bootproto = conn.bootproto.name file.name = conn.description + file.lladdr = conn.lladdress file.startmode = conn.startmode.to_s file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" add_ips(conn) diff --git a/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb b/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb new file mode 100644 index 000000000..2841fad46 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/ethernet" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Qeth + # object to the underlying system. + class Qeth < Ethernet + end + end + end +end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 684eb22c7..2736fb0d2 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -177,6 +177,10 @@ def variable_name(param_name) # @return [Hash] Netmasks define_collection_variable(:netmask) + # !@attribute [r] lladdr + # @return [String] Link layer address + define_variable(:lladdr) + # !@attribute [r] wireless_key_length # @return [Integer] Length in bits for all keys used define_variable(:wireless_key_length, :integer) diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth5 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth5 new file mode 100644 index 000000000..2f9e6e88b --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth5 @@ -0,0 +1,4 @@ +STARTMODE='auto' +BOOTPROTO='static' +IPADDR='192.168.50.1/24' +LLADDR='00:06:29:55:2A:01' diff --git a/test/y2network/connection_config/qeth_test.rb b/test/y2network/connection_config/qeth_test.rb new file mode 100644 index 000000000..ff60b2572 --- /dev/null +++ b/test/y2network/connection_config/qeth_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/qeth" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Qeth do + describe "#type" do + it "returns 'qeth'" do + expect(subject.type).to eq(Y2Network::InterfaceType::QETH) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/qeth_test.rb b/test/y2network/sysconfig/connection_config_readers/qeth_test.rb new file mode 100644 index 000000000..85d7f20c6 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/qeth_test.rb @@ -0,0 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/qeth" +require "y2network/sysconfig/interface_file" +require "y2network/boot_protocol" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Qeth do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "eth5" } + + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a qeth connection config object" do + qeth = handler.connection_config + expect(qeth.type).to eql(Y2Network::InterfaceType::QETH) + expect(qeth.interface).to eq("eth5") + expect(qeth.ip.address).to eq(Y2Network::IPAddress.from_string("192.168.50.1/24")) + expect(qeth.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/qeth_test.rb b/test/y2network/sysconfig/connection_config_writers/qeth_test.rb new file mode 100644 index 000000000..4a2c5f431 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/qeth_test.rb @@ -0,0 +1,53 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/qeth" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/qeth" +require "y2network/connection_config/ip_config" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Qeth do + subject(:handler) { described_class.new(file) } + + let(:conn) do + Y2Network::ConnectionConfig::Qeth.new.tap do |c| + c.name = "eth6" + c.interface = "eth6" + c.bootproto = Y2Network::BootProtocol::STATIC + c.lladdress = "00:06:29:55:2A:04" + c.startmode = Y2Network::Startmode.create("auto") + end + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "static", + startmode: "auto", + lladdr: "00:06:29:55:2A:04" + ) + end + end +end From 076a4b219f5660f854dfed398b3f5c75c80618f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 12:06:17 +0100 Subject: [PATCH 143/471] Update InterfaceFile unit tests --- test/y2network/sysconfig/interface_file_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 5954d046f..531c34f9b 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -180,7 +180,7 @@ def file_content(scr_root, file) file.save content = file_content(scr_root, file) - expect(content).to match("IPADDR_0=''") + expect(content).to_not include("IPADDR_0") end end From 2448f2be7aaf8199844191830aa5a025f460c195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 14:40:42 +0100 Subject: [PATCH 144/471] Implement BootProtocol#== --- src/lib/y2network/boot_protocol.rb | 12 ++++++++++++ test/y2network/boot_protocol_test.rb | 16 +++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/boot_protocol.rb b/src/lib/y2network/boot_protocol.rb index 18494063a..8e27ff62b 100644 --- a/src/lib/y2network/boot_protocol.rb +++ b/src/lib/y2network/boot_protocol.rb @@ -56,6 +56,18 @@ def dhcp? [DHCP4, DHCP6, DHCP, DHCP_AUTOIP].include?(self) end + # Determines whether two objects are equivalent + # + # They are equal when they refer to the same boot protocol (through the name). + # + # @param other [BootProtocol] Boot protocol to compare with + # @return [Boolean] + def ==(other) + name == other.name + end + + alias_method :eql?, :== + # iBFT boot protocol IBFT = new("ibft") # statically assigned interface properties diff --git a/test/y2network/boot_protocol_test.rb b/test/y2network/boot_protocol_test.rb index 5ac46cfaf..b67921359 100644 --- a/test/y2network/boot_protocol_test.rb +++ b/test/y2network/boot_protocol_test.rb @@ -22,7 +22,7 @@ require "y2network/boot_protocol" describe Y2Network::BootProtocol do - subject { described_class.new("dhcp") } + subject(:protocol) { described_class.new("dhcp") } describe ".all" do it "returns all known boot protocols" do @@ -48,4 +48,18 @@ expect(Y2Network::BootProtocol::STATIC.dhcp?).to eq false end end + + describe "#==" do + context "when the other object refers to the same boot protocol" do + it "returns true" do + expect(protocol).to eq(described_class.new("dhcp")) + end + end + + context "when the other object refers to a different boot protocol" do + it "returns false" do + expect(protocol).to_not eq(described_class.new("static")) + end + end + end end From 55a159483d258dbbfa1be8e38d33ab957ae58645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 14:41:02 +0100 Subject: [PATCH 145/471] Implement IpoibMode#== and add unit tests for the whole class --- src/lib/y2network/ipoib_mode.rb | 12 +++++++ test/y2network/ipoib_mode_test.rb | 56 +++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 test/y2network/ipoib_mode_test.rb diff --git a/src/lib/y2network/ipoib_mode.rb b/src/lib/y2network/ipoib_mode.rb index 37d9728c2..258f9a397 100644 --- a/src/lib/y2network/ipoib_mode.rb +++ b/src/lib/y2network/ipoib_mode.rb @@ -51,6 +51,18 @@ def initialize(name) @name = name end + # Determines whether two objects are equivalent + # + # They are equal when they refer to the same IPoIB mode (through the name). + # + # @param other [IpoibMode] IPoIB mode to compare with + # @return [Boolean] + def ==(other) + name == other.name + end + + alias_method :eql?, :== + DATAGRAM = new("datagram") CONNECTED = new("connected") # Not a mode at all but the default value that will be choose by the IB diff --git a/test/y2network/ipoib_mode_test.rb b/test/y2network/ipoib_mode_test.rb new file mode 100644 index 000000000..6f961bad3 --- /dev/null +++ b/test/y2network/ipoib_mode_test.rb @@ -0,0 +1,56 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" + +require "y2network/ipoib_mode" + +describe Y2Network::IpoibMode do + subject(:mode) { described_class.new("datagram") } + + describe ".all" do + it "returns all know IPoIB modes" do + expect(described_class.all).to contain_exactly( + Y2Network::IpoibMode::CONNECTED, + Y2Network::IpoibMode::DATAGRAM, + Y2Network::IpoibMode::DEFAULT + ) + end + end + + describe ".from_name" do + it "returns the IPoIB mode with the given mode" do + expect(described_class.from_name("datagram")).to eq(Y2Network::IpoibMode::DATAGRAM) + end + end + + describe "#==" do + context "when the other object refers to the same IPoIB mode" do + it "returns true" do + expect(mode).to eq(described_class.new("datagram")) + end + end + + context "when the other object refers to a different IPoIB mode" do + it "returns false" do + expect(mode).to_not eq(described_class.new("connected")) + end + end + end +end From ed5c3a3a41fb0a5f00f5986022b0171da89f0822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 15:10:38 +0100 Subject: [PATCH 146/471] Fix comparison with boot protocol --- src/include/network/lan/address.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index dc5a154d9..42070e00b 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -28,6 +28,7 @@ # require "y2firewall/helpers/interfaces" require "y2network/dialogs/edit_interface" +require "y2network/boot_protocol" module Yast module NetworkLanAddressInclude @@ -73,9 +74,9 @@ def AddressDialog(builder:) # IP is mandatory for static configuration. Makes no sense to write static # configuration without that. - return ret if bootproto == "static" && ipaddr.empty? + return ret if bootproto == Y2Network::BootProtocol::STATIC && ipaddr.empty? - if bootproto == "static" + if bootproto == Y2Network::BootProtocol::STATIC update_hostname(ipaddr, builder.hostname || "") elsif LanItems.isCurrentDHCP && !LanItems.isCurrentHotplug # fixed bug #73739 - if dhcp is used, dont set default gw statically From 8bb334af28f18051f5a44b8d4b8d08438a27e2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 15:30:02 +0100 Subject: [PATCH 147/471] Use strings where needed in InterfaceConfigBuilder --- src/lib/y2network/interface_config_builder.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 524c7637d..78265b5f0 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -256,9 +256,9 @@ def aliases new_aliases = @connection_config.ip_aliases.map do |data| { - label: data.label, - ip: data.address.address, - prefixlen: data.address.prefix + label: data.label.to_s, + ip: data.address.address.to_s, + prefixlen: data.address.prefix.to_s, # NOTE: new API does not have netmask at all, we need to adapt UI to clearly mention only prefix } end @@ -294,7 +294,7 @@ def ip_address default = @connection_config.ip new_ = if default - default.address.address + default.address.address.to_s else "" end From 08c005a1590c80479a7c48fd0c8b92a227f83db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 15:30:35 +0100 Subject: [PATCH 148/471] Consider aliases labels as strings --- src/lib/y2network/sysconfig/interface_file.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 2d42edc56..e36a04911 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -154,7 +154,7 @@ def variable_name(param_name) # !@attribute [r] labels # @return [Hash] Label to assign to the address - define_collection_variable(:label, :symbol) + define_collection_variable(:label, :string) # !@attribute [r] remote_ipaddrs # @return [Hash] Remote IP address of a point to point connection From 8203117832fce9ce1dc37a308fc7a8f15c00b20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 15:52:37 +0100 Subject: [PATCH 149/471] Support for Y2NETWORK_NEW_BACKEND * It will use the new backend to read/write a connection configuration. --- src/lib/y2network/interface_config_builder.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 78265b5f0..17c0fba81 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -566,7 +566,8 @@ def ip_config_default def select_backend(old, new) log.error "Different value in backends. Old: #{old.inspect} New: #{new.inspect}" if new != old - old + # XXX: to be removed when fully migrated to the new backend + ENV["Y2NETWORK_NEW_BACKEND"] == "1" ? new : old end # Returns the connection config class for a given type From 871401bf070e0fb31ddc27e1e579ad159d6ece44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 1 Aug 2019 16:02:49 +0100 Subject: [PATCH 150/471] Use new_value instead of new as variable name --- src/lib/y2network/interface_config_builder.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 17c0fba81..c805a9956 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -563,11 +563,16 @@ def ip_config_default # method that allows easy change of backend for providing data # it also logs error if result differs # TODO: Only temporary method for testing switch of backends. Remove it from production - def select_backend(old, new) - log.error "Different value in backends. Old: #{old.inspect} New: #{new.inspect}" if new != old + # + # @param old_value [Object] + # @param new_value [Object] + def select_backend(old_value, new_value) + if new_value != old_value + log.error "Different value in backends. Old: #{old_value.inspect} New: #{new_value.inspect}" + end # XXX: to be removed when fully migrated to the new backend - ENV["Y2NETWORK_NEW_BACKEND"] == "1" ? new : old + ENV["Y2NETWORK_NEW_BACKEND"] == "1" ? new_value : old_value end # Returns the connection config class for a given type From 74cb2cd42018ba8113e04efa142622c6f29bc740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 1 Aug 2019 15:59:07 +0100 Subject: [PATCH 151/471] Added hsi connection config --- src/lib/y2network/connection_config/hsi.rb | 28 +++++++++++ src/lib/y2network/interface_type.rb | 2 +- .../connection_config_readers/hsi.rb | 31 ++++++++++++ .../connection_config_writers/hsi.rb | 31 ++++++++++++ .../scr_read/etc/sysconfig/network/ifcfg-hsi0 | 3 ++ test/y2network/connection_config/hsi_test.rb | 30 +++++++++++ .../connection_config_readers/hsi_test.rb | 49 ++++++++++++++++++ .../connection_config_writers/hsi_test.rb | 50 +++++++++++++++++++ .../connection_config_writers/qeth_test.rb | 1 - 9 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 src/lib/y2network/connection_config/hsi.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/hsi.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/hsi.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-hsi0 create mode 100644 test/y2network/connection_config/hsi_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/hsi_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/hsi_test.rb diff --git a/src/lib/y2network/connection_config/hsi.rb b/src/lib/y2network/connection_config/hsi.rb new file mode 100644 index 000000000..96d2afd9f --- /dev/null +++ b/src/lib/y2network/connection_config/hsi.rb @@ -0,0 +1,28 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for hsi connections + class Hsi < Base + end + end +end diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index c1a0a0756..edd4119e9 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -131,7 +131,7 @@ def method_missing(method_name, *arguments, &block) # LAN-Channel-Station (LCS) network devices. S390 specific. LCS = new(N_("LCS"), "lcs") # HiperSockets s390 network device - HIPERSOCKETS = new(N_("HiperSockets"), "hsi") + HSI = new(N_("HSI"), "hsi") # FICON-attached direct access storage devices. s390 specific FICON = new(N_("FICON"), "ficon") end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb b/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb new file mode 100644 index 000000000..2cab7e2cc --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/ethernet" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Hsi object given a + # Sysconfig::InterfaceFile object. + class Hsi < Ethernet + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb b/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb new file mode 100644 index 000000000..a0852c0e0 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/ethernet" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a + # ConnectionConfig::Hsi object to the underlying system. + class Hsi < Ethernet + end + end + end +end diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-hsi0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-hsi0 new file mode 100644 index 000000000..09fd4f449 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-hsi0 @@ -0,0 +1,3 @@ +STARTMODE='auto' +BOOTPROTO='static' +IPADDR='192.168.100.10/24' diff --git a/test/y2network/connection_config/hsi_test.rb b/test/y2network/connection_config/hsi_test.rb new file mode 100644 index 000000000..bee5b6a7d --- /dev/null +++ b/test/y2network/connection_config/hsi_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/hsi" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Hsi do + describe "#type" do + it "returns 'hsi'" do + expect(subject.type).to eq(Y2Network::InterfaceType::HSI) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/hsi_test.rb b/test/y2network/sysconfig/connection_config_readers/hsi_test.rb new file mode 100644 index 000000000..533ed1ebf --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/hsi_test.rb @@ -0,0 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/hsi" +require "y2network/sysconfig/interface_file" +require "y2network/boot_protocol" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Hsi do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "hsi0" } + + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a hsi connection config object" do + hsi = handler.connection_config + expect(hsi.type).to eql(Y2Network::InterfaceType::HSI) + expect(hsi.interface).to eq("hsi0") + expect(hsi.ip.address).to eq(Y2Network::IPAddress.from_string("192.168.100.10/24")) + expect(hsi.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/hsi_test.rb b/test/y2network/sysconfig/connection_config_writers/hsi_test.rb new file mode 100644 index 000000000..63d016b43 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/hsi_test.rb @@ -0,0 +1,50 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/hsi" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/hsi" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Hsi do + subject(:handler) { described_class.new(file) } + + let(:conn) do + Y2Network::ConnectionConfig::Hsi.new.tap do |c| + c.name = "hsi1" + c.interface = "hsi1" + c.bootproto = Y2Network::BootProtocol::DHCP + c.startmode = Y2Network::Startmode.create("auto") + end + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "dhcp", + startmode: "auto" + ) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/qeth_test.rb b/test/y2network/sysconfig/connection_config_writers/qeth_test.rb index 4a2c5f431..4aabcd339 100644 --- a/test/y2network/sysconfig/connection_config_writers/qeth_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/qeth_test.rb @@ -23,7 +23,6 @@ require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/qeth" -require "y2network/connection_config/ip_config" describe Y2Network::Sysconfig::ConnectionConfigWriters::Qeth do subject(:handler) { described_class.new(file) } From ef064b11a3cbad53f1619b77ec2629d57378794f Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Tue, 30 Jul 2019 09:56:34 +0200 Subject: [PATCH 152/471] Relax dependency on LanItems in HwInfo class --- src/lib/y2network/hwinfo.rb | 12 ++++++++---- test/y2network/hwinfo_test.rb | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index dff3a9da2..96e36fe87 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -21,6 +21,12 @@ require "y2network/driver" module Y2Network + class HardwareWrapper + def initialize + Yast.include self, "network/routines.rb" + end + end + # Stores useful (from networking POV) items of hwinfo for an interface # FIXME: decide whether it should read hwinfo (on demand or at once) for a network # device and store only necessary info or just parse provided hash @@ -113,11 +119,9 @@ def drivers private - # for textdomain in network/hardware.rb - include Yast::I18n - def load_hwinfo(name) - Yast::LanItems.Hardware.find { |h| h["dev_name"] == name } + netcards = HardwareWrapper.new.ReadHardware("netcard") + netcards.find { |h| h["dev_name"] == name } end end end diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 985c2d4d9..90ed3fa87 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -30,7 +30,7 @@ let(:interface_name) { "enp1s0" } before do - allow(Yast::LanItems).to receive(:Hardware).and_return(hardware) + allow_any_instance_of(Y2Network::HardwareWrapper).to receive(:ReadHardware).and_return(hardware) end describe "#exists?" do From 9d720bde320646e7088447e1ffb1631845bae19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Sat, 3 Aug 2019 15:56:35 +0100 Subject: [PATCH 153/471] Added ctc connection config --- src/lib/y2network/connection_config/ctc.rb | 34 +++++++++++++ src/lib/y2network/connection_config/qeth.rb | 17 +++++++ src/lib/y2network/interface_type.rb | 2 + .../connection_config_readers/ctc.rb | 36 +++++++++++++ .../connection_config_writers/ctc.rb | 36 +++++++++++++ .../scr_read/etc/sysconfig/network/ifcfg-ctc0 | 3 ++ test/y2network/connection_config/ctc_test.rb | 30 +++++++++++ .../connection_config_readers/ctc_test.rb | 49 ++++++++++++++++++ .../connection_config_writers/ctc_test.rb | 50 +++++++++++++++++++ 9 files changed, 257 insertions(+) create mode 100644 src/lib/y2network/connection_config/ctc.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/ctc.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/ctc.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-ctc0 create mode 100644 test/y2network/connection_config/ctc_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/ctc_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/ctc_test.rb diff --git a/src/lib/y2network/connection_config/ctc.rb b/src/lib/y2network/connection_config/ctc.rb new file mode 100644 index 000000000..dec6acab8 --- /dev/null +++ b/src/lib/y2network/connection_config/ctc.rb @@ -0,0 +1,34 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for ctc connections + class Ctc < Base + # @return [String] read bus id + attr_accessor :read_channel + # @return [String] write bus id + attr_accessor :write_channel + # @return [Integer] connection protocol + attr_accessor :protocol + end + end +end diff --git a/src/lib/y2network/connection_config/qeth.rb b/src/lib/y2network/connection_config/qeth.rb index 767963da7..9ebfd78c2 100644 --- a/src/lib/y2network/connection_config/qeth.rb +++ b/src/lib/y2network/connection_config/qeth.rb @@ -23,6 +23,23 @@ module Y2Network module ConnectionConfig # Configuration for qeth connections class Qeth < Base + # @return [String] read bus id + attr_accessor :read_channel + # @return [String] write bus id + attr_accessor :write_channel + # @return [String] data bus id + attr_accessor :data_channel + # @return [Boolean] whether layer2 is enabled or not + attr_accessor :layer2 + # @return [Integer] port number + attr_accessor :port_number + + # Constructor + def initialize + super() + @layer2 = false + @port_number = 0 + end end end end diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index edd4119e9..ce7247710 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -132,6 +132,8 @@ def method_missing(method_name, *arguments, &block) LCS = new(N_("LCS"), "lcs") # HiperSockets s390 network device HSI = new(N_("HSI"), "hsi") + # Channel To Channel + CTC = new(N_("CTC"), "ctc") # FICON-attached direct access storage devices. s390 specific FICON = new(N_("FICON"), "ficon") end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb b/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb new file mode 100644 index 000000000..feffab750 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb @@ -0,0 +1,36 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Ctc object given a + # Sysconfig::InterfaceFile object. + class Ctc < Base + private + + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(_conn) + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb b/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb new file mode 100644 index 000000000..e98105579 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb @@ -0,0 +1,36 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Ctc + # object to the underlying system. + class Ctc < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(_conn) + end + end + end + end +end diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-ctc0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-ctc0 new file mode 100644 index 000000000..132179fce --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-ctc0 @@ -0,0 +1,3 @@ +STARTMODE='auto' +BOOTPROTO='static' +IPADDR='192.168.20.50/24' diff --git a/test/y2network/connection_config/ctc_test.rb b/test/y2network/connection_config/ctc_test.rb new file mode 100644 index 000000000..67bac2757 --- /dev/null +++ b/test/y2network/connection_config/ctc_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/ctc" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Ctc do + describe "#type" do + it "returns 'ctc'" do + expect(subject.type).to eq(Y2Network::InterfaceType::CTC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/ctc_test.rb b/test/y2network/sysconfig/connection_config_readers/ctc_test.rb new file mode 100644 index 000000000..a5ad1e0a9 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/ctc_test.rb @@ -0,0 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/ctc" +require "y2network/sysconfig/interface_file" +require "y2network/boot_protocol" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Ctc do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "ctc0" } + + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a ctc connection config object" do + ctc = handler.connection_config + expect(ctc.type).to eql(Y2Network::InterfaceType::CTC) + expect(ctc.interface).to eq("ctc0") + expect(ctc.ip.address).to eq(Y2Network::IPAddress.from_string("192.168.20.50/24")) + expect(ctc.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/ctc_test.rb b/test/y2network/sysconfig/connection_config_writers/ctc_test.rb new file mode 100644 index 000000000..f7acb157f --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/ctc_test.rb @@ -0,0 +1,50 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/ctc" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/ctc" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Ctc do + subject(:handler) { described_class.new(file) } + + let(:conn) do + Y2Network::ConnectionConfig::Ctc.new.tap do |c| + c.name = "ctc1" + c.interface = "ctc1" + c.bootproto = Y2Network::BootProtocol::DHCP + c.startmode = Y2Network::Startmode.create("auto") + end + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "dhcp", + startmode: "auto" + ) + end + end +end From 07ecab52cdaaa776cdeea2dd479ddde3cbb2ebbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 12 Aug 2019 07:06:34 +0100 Subject: [PATCH 154/471] Added wireless test dialog and widgets --- src/clients/wireless_test.rb | 37 +++++ src/lib/y2network/dialogs/wireless.rb | 50 +++++++ src/lib/y2network/dialogs/wireless_eap.rb | 21 +++ .../dialogs/wireless_expert_settings.rb | 103 +++++++++++++ .../y2network/dialogs/wireless_wep_keys.rb | 80 ++++++++++ .../interface_config_builders/wireless.rb | 70 +++++++++ src/lib/y2network/widgets/wireless.rb | 141 ++++++++++++++++++ .../y2network/widgets/wireless_auth_mode.rb | 43 ++++++ src/lib/y2network/widgets/wireless_eap.rb | 38 +++++ .../y2network/widgets/wireless_eap_mode.rb | 17 +++ .../y2network/widgets/wireless_encryption.rb | 54 +++++++ src/lib/y2network/widgets/wireless_essid.rb | 121 +++++++++++++++ src/lib/y2network/widgets/wireless_expert.rb | 109 ++++++++++++++ src/lib/y2network/widgets/wireless_mode.rb | 28 ++++ 14 files changed, 912 insertions(+) create mode 100644 src/clients/wireless_test.rb create mode 100644 src/lib/y2network/dialogs/wireless.rb create mode 100644 src/lib/y2network/dialogs/wireless_eap.rb create mode 100644 src/lib/y2network/dialogs/wireless_expert_settings.rb create mode 100644 src/lib/y2network/dialogs/wireless_wep_keys.rb create mode 100644 src/lib/y2network/interface_config_builders/wireless.rb create mode 100644 src/lib/y2network/widgets/wireless.rb create mode 100644 src/lib/y2network/widgets/wireless_auth_mode.rb create mode 100644 src/lib/y2network/widgets/wireless_eap.rb create mode 100644 src/lib/y2network/widgets/wireless_eap_mode.rb create mode 100644 src/lib/y2network/widgets/wireless_encryption.rb create mode 100644 src/lib/y2network/widgets/wireless_essid.rb create mode 100644 src/lib/y2network/widgets/wireless_expert.rb create mode 100644 src/lib/y2network/widgets/wireless_mode.rb diff --git a/src/clients/wireless_test.rb b/src/clients/wireless_test.rb new file mode 100644 index 000000000..fdb45e1d0 --- /dev/null +++ b/src/clients/wireless_test.rb @@ -0,0 +1,37 @@ +require "yast" +require "y2network/dialogs/wireless" +require "y2network/interface_config_builder" + +module Yast + class Wireless < Client + def main + Yast.import "UI" + textdomain "network" + Yast.import "Lan" + Yast.import "NetworkService" + + Wizard.CreateDialog + Wizard.SetDesktopTitleAndIcon("routing") + Wizard.SetNextButton(:next, Label.FinishButton) + + Lan.Read(:cache) + config = Lan.yast_config.copy + interface = LanItems.find_type_ifaces("wlan").first + + if interface + LanItems.FindAndSelect(interface) + connection_config = config.connections.by_name(LanItems.GetCurrentName) + builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) + builder.name = LanItems.GetCurrentName() + LanItems.SetItem(builder: builder) + Y2Network::Dialogs::Wireless.run(builder) + else + Yast::Popup.Error("No interface to configure") + end + + UI.CloseDialog + end + end +end + +Yast::Wireless.new.main diff --git a/src/lib/y2network/dialogs/wireless.rb b/src/lib/y2network/dialogs/wireless.rb new file mode 100644 index 000000000..9f3592d5f --- /dev/null +++ b/src/lib/y2network/dialogs/wireless.rb @@ -0,0 +1,50 @@ +require "yast" +require "cwm/dialog" +require "y2network/widgets/wireless" +require "y2network/dialogs/wireless_eap" + +module Y2Network + module Dialogs + class Wireless < CWM::Dialog + # @param settings [InterfaceBuilder] object holding interface configuration + # modified by the dialog. + def initialize(settings) + @settings = settings + + textdomain "network" + end + + def title + _("Wireless Network Card Configuration") + end + + def contents + HBox( + HSpacing(4), + wireless_widget, + HSpacing(4) + ) + end + + def settings + @settings + end + + def run + ret = super + if settings.auth_mode == "wpa-eap" + ret = Y2Network::Dialogs::WirelessEap.new(settings).run + return :redraw if ret == :back + end + + settings.save if ret == :next + end + + private + + def wireless_widget + @wireless_widget ||= Y2Network::Widgets::Wireless.new(settings) + end + end + end +end diff --git a/src/lib/y2network/dialogs/wireless_eap.rb b/src/lib/y2network/dialogs/wireless_eap.rb new file mode 100644 index 000000000..a00540bfe --- /dev/null +++ b/src/lib/y2network/dialogs/wireless_eap.rb @@ -0,0 +1,21 @@ +require "yast" +require "cwm/dialog" +require "y2network/widgets/wireless" + +module Y2Network + module Dialogs + class WirelessEap < CWM::Dialog + def initialize(settings) + @settings = settings + + textdomain = "network" + end + + def contents + VBox( + Label("EAP Dialog") + ) + end + end + end +end diff --git a/src/lib/y2network/dialogs/wireless_expert_settings.rb b/src/lib/y2network/dialogs/wireless_expert_settings.rb new file mode 100644 index 000000000..1f26797eb --- /dev/null +++ b/src/lib/y2network/dialogs/wireless_expert_settings.rb @@ -0,0 +1,103 @@ +require "yast" +require "cwm/dialog" +require "y2network/widgets/wireless" +require "y2network/widgets/wireless_expert" + +module Y2Network + module Dialogs + class WirelessExpertSettings < CWM::Dialog + # @param settings [InterfaceBuilder] object holding interface configuration + # modified by the dialog. + def initialize(settings) + @settings = settings + + textdomain "network" + end + + def title + _("Wireless Expert Settings") + end + + def contents + HBox( + HSpacing(4), + VBox( + VSpacing(0.5), + Frame( + _("Wireless Expert Settings"), + HBox( + HSpacing(2), + VBox( + VSpacing(1), + channel_widget, + VSpacing(0.2), + bitrate_widget, + VSpacing(0.2), + access_point_widget, + VSpacing(0.2), + Left(power_management_widget), + VSpacing(0.2), + Left(ap_scan_mode_widget), + VSpacing(1) + ), + HSpacing(2) + ) + ), + VSpacing(0.5) + ), + HSpacing(4) + ) + end + + def help + # Wireless expert dialog help 1/5 + _( + "

Here, set additional configuration parameters\n(rarely needed).

" + ) + + # Wireless expert dialog help 2/5 + _( + "

To use your wireless LAN card in master or ad-hoc mode,\n" \ + "set the Channel the card should use here. This is not needed\n" \ + "for managed mode--the card will hop through the channels searching for access\n" \ + "points in that case.

\n" + ) + + # Wireless expert dialog help 3/5 + _( + "

In some rare cases, you may want to set a transmission\nBit Rate explicitly. The default is to go as fast as possible.

" + ) + + # Wireless expert dialog help 4/5 + _( + "

In an environment with multiple Access Points, you may want to\ndefine the one to which to connect by entering its MAC address.

" + ) + + # Wireless expert dialog help 5/5 + _( + "

Use Power Management enables power saving mechanisms.\n" \ + "This is generally a good idea, especially if you are a laptop user and may\n" \ + "be disconnected from AC power.

\n" + ) + end + + private + + def channel_widget + @channel_widget ||= Y2Network::Widgets::WirelessChannel.new(@settings) + end + + def bitrate_widget + @bitrate_widget ||= Y2Network::Widgets::WirelessBitRate.new(@settings) + end + + def access_point_widget + @access_point_widget ||= Y2Network::Widgets::WirelessAccessPoint.new(@settings) + end + + def power_management_widget + @access_power_widget ||= Y2Network::Widgets::WirelessPowerManagement.new(@settings) + end + + def ap_scan_mode_widget + @ap_scan_mode_widget ||= Y2Network::Widgets::WirelessAPScanMode.new(@settings) + end + end + end +end diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb new file mode 100644 index 000000000..7b6af1daa --- /dev/null +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -0,0 +1,80 @@ +require "cwm/dialog" + +module Y2Network + module Dialogs + class WirelessWepKeys < CWM::Dialog + def initialize(settings) + @settings = settings + end + + def title + _("Wireless Keys") + end + + def help + _( + "

In this dialog, define your WEP keys used\n" \ + "to encrypt your data before it is transmitted. You can have up to four keys,\n" \ + "although only one key is used to encrypt the data. This is the default key.\n" \ + "The other keys can be used to decrypt data. Usually you have only\n" \ + "one key.

" + ) + + # Wireless keys dialog help 2/3 + _( + "

Key Length defines the bit length of your WEP keys.\n" \ + "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" \ + "Some older hardware might not be able to handle 128 bit keys, so if your\n" \ + "wireless LAN connection does not establish, you may need to set this\n" \ + "value to 64.

" + ) + "" + end + + def contents + HBox( + HSpacing(5), + VBox( + VSpacing(1), + # Frame label + Frame( + _("WEP Keys"), + HBox( + HSpacing(3), + VBox( + VSpacing(1), + # ComboBox label + Left(ComboBox(Id(:length), _("&Key Length"), [64,128])), + VSpacing(1), + Table( + Id(:table), + Opt(:notify), + Header( + # Table header label + # Abbreviation of Number + _("No."), + # Table header label + _("Key"), + # Table header label + Center(_("Default")) + ), + ), + HBox( + # PushButton label + PushButton(Id(:edit), Yast::Label.EditButton), + # PushButton label + PushButton(Id(:delete), Yast::Label.DeleteButton), + # PushButton label + PushButton(Id(:default), _("&Set as Default")) + ), + VSpacing(1) + ), + HSpacing(3) + ) + ), + VSpacing(1) + ), + HSpacing(5) + ) + end + end + end +end diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb new file mode 100644 index 000000000..95559226c --- /dev/null +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -0,0 +1,70 @@ +require "yast" +require "y2network/config" +require "y2network/interface_config_builder" + +module Y2Network + module InterfaceConfigBuilders + class Wireless < InterfaceConfigBuilder + include Yast::Logger + + def initialize(config: nil) + super(type: InterfaceType::WIRELESS, config: config) + end + + def mode + select_backend( + @config["WIRELESS_MODE"], + @connection_config.mode + ) + end + + def mode=(mode) + @config["WIRELESS_MODE"] = mode + @connection_config.mode = mode + end + + def essid + select_backend( + @config["WIRELESS_ESSID"], + @connection_config.essid + ) + end + + def auth_modes + Yast::LanItems.wl_auth_modes + end + + def auth_mode + select_backend( + @config["WIRELESS_AUTH_MODE"], + @connection_config.auth_mode + ) + end + + def auth_mode=(mode) + @config["WIRELESS_AUTH_MODE"] = mode + @connection_config.auth_mode = mode + puts @config.inspect + end + + def eap_mode + select_backend( + @config["WPA_EAP_MODE"], + @connection_config.eap_mode + ) + end + + def eap_mode=(mode) + @config["WIRELESS_EAP_MODE"] = mode + @connection_config.eap_mode = mode + end + + def access_point + select_backend( + @config["WIRELESS_AP"], + @connection_config.ap + ) + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless.rb b/src/lib/y2network/widgets/wireless.rb new file mode 100644 index 000000000..803fb8d83 --- /dev/null +++ b/src/lib/y2network/widgets/wireless.rb @@ -0,0 +1,141 @@ +require "y2network/widgets/wireless_essid" +require "y2network/widgets/wireless_eap" +require "y2network/widgets/wireless_encryption" +require "y2network/widgets/wireless_mode" +require "y2network/widgets/wireless_auth_mode" +require "y2network/dialogs/wireless_wep_keys" +require "y2network/dialogs/wireless_expert_settings" + +module Y2Network + module Widgets + class Wireless < CWM::CustomWidget + attr_reader :settings + + def initialize(settings) + @settings = settings + self.handle_all_events = true + end + + def init + end + + def handle(event) + case event["ID"] + when auth_mode_widget.widget_id + refresh + when mode_widget.widget_id + refresh + end + + nil + end + + def contents + VBox( + VSpacing(0.5), + # Frame label + Frame( + _("Wireless Device Settings"), + HBox( + HSpacing(2), + VBox( + VSpacing(0.5), + # ComboBox label + mode_widget, + VSpacing(0.2), + # Text entry label + essid_widget, + VSpacing(0.2), + auth_mode_widget, + VSpacing(0.2), + encryption_widget, + VSpacing(0.5) + ), + HSpacing(2) + ) + ), + VSpacing(0.5), + HBox( + expert_settings_widget, + HSpacing(0.5), + wep_keys_widget + ), + VSpacing(0.5) + ) + end + + private + + def refresh + wep_keys_widget.disable + encryption_widget.enable + case auth_mode_widget.value + when "wpa-eap" + mode_widget.value = "Managed" + encryption_widget.disable + when "wpa-psk" + mode_widget.value = "Managed" + when "wep" + encryption_widget.disable + wep_keys_widget.enable + when "no-encryption" + encryption_widget.disable + end + end + + def mode_widget + @mode_widget ||= Y2Network::Widgets::WirelessMode.new(settings) + end + + def essid_widget + @essid_widget ||= Y2Network::Widgets::WirelessEssid.new(settings) + end + + def auth_mode_widget + @auth_mode_widget ||= Y2Network::Widgets::WirelessAuthMode.new(settings) + end + + def encryption_widget + @encryption_widget ||= Y2Network::Widgets::WirelessEncryption.new(settings) + end + + def expert_settings_widget + @expert_settings_widget ||= Y2Network::Widgets::WirelessExpertSettings.new(settings) + end + + def wep_keys_widget + @wep_keys_widget ||= Y2Network::Widgets::WirelessWepKeys.new(settings) + end + end + + class WirelessExpertSettings < CWM::PushButton + def initialize(settings) + @settings = settings + end + + def label + _("E&xpert Settings") + end + + def handle + Y2Network::Dialogs::WirelessExpertSettings.new(@settings).run + + nil + end + end + + class WirelessWepKeys < CWM::PushButton + def initialize(settings) + @settings = settings + end + + def label + _("&WEP Keys") + end + + def handle + Y2Network::Dialogs::WirelessWepKeys.run(@settings) + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_auth_mode.rb b/src/lib/y2network/widgets/wireless_auth_mode.rb new file mode 100644 index 000000000..8cd58f91c --- /dev/null +++ b/src/lib/y2network/widgets/wireless_auth_mode.rb @@ -0,0 +1,43 @@ +require "cwm/common_widgets" + +module Y2Network + module Widgets + class WirelessAuthMode < CWM::ComboBox + def initialize(settings) + @settings = settings + end + + def init + self.value = @settings.auth_mode + end + + def label + _("&Authentication Mode") + end + + def opt + [:hstretch, :notify] + end + + def items + [ + ["no-encryption", _("No Encryption")], + ["open", _("WEP - Open")], + ["sharedkey", _("WEP - Shared Key")], + ["wpa-psk", _("WPA-PSK (WPA version 1 or 2)")], + ["wpa-eap", _("WPA-EAP (WPA version 1 or 2)")] + ] + end + + def help + "

WPA-EAP uses a RADIUS server to authenticate users. There\n" \ + "are different methods in EAP to connect to the server and\n" \ + "perform the authentication, namely TLS, TTLS, and PEAP.

\n" + end + + def store + @settings.auth_mode = self.value + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb new file mode 100644 index 000000000..0770fe9c0 --- /dev/null +++ b/src/lib/y2network/widgets/wireless_eap.rb @@ -0,0 +1,38 @@ +require "cwm/common_widgets" + +module Y2Network + module Widgets + class WirelessEapMode < CWM::ComboBox + def initialize(settings) + @settings = settings + end + + def init + self.value = @settings.eap_mode + end + + def label + _("EAP &Mode") + end + + def opt + [:notify] + end + + def items + [ + ["PEAP", _("PEAP")], + ["TLS", _("TLS")], + ["TTLS", _("TTLS")] + ] + end + + def help + "

WPA-EAP uses a RADIUS server to authenticate users. There\n" \ + "are different methods in EAP to connect to the server and\n" \ + "perform the authentication, namely TLS, TTLS, and PEAP.

\n" + end + end + end +end + diff --git a/src/lib/y2network/widgets/wireless_eap_mode.rb b/src/lib/y2network/widgets/wireless_eap_mode.rb new file mode 100644 index 000000000..7ce85d879 --- /dev/null +++ b/src/lib/y2network/widgets/wireless_eap_mode.rb @@ -0,0 +1,17 @@ +require "cwm/common_widgets" + +module Y2Network + module Widgets + class WirelessEapMode < CWM::ComboBox + def initialize(settings) + end + + def help + "

WPA-EAP uses a RADIUS server to authenticate users. There\n" \ + "are different methods in EAP to connect to the server and\n" \ + "perform the authentication, namely TLS, TTLS, and PEAP.

\n" + end + end + end +end + diff --git a/src/lib/y2network/widgets/wireless_encryption.rb b/src/lib/y2network/widgets/wireless_encryption.rb new file mode 100644 index 000000000..3b1867b1c --- /dev/null +++ b/src/lib/y2network/widgets/wireless_encryption.rb @@ -0,0 +1,54 @@ +require "cwm/common_widgets" +require "cwm/custom_widget" + +module Y2Network + module Widgets + class WirelessEncryption < CWM::CustomWidget + def initialize(settings) + @settings = settings + @key_widget = WirelessEncryptionKey.new(settings) + end + + def contents + VBox( + # Translators: input type for a wireless key + # radio button group label + Left(Label(_("Key Input Type"))), + Left( + HBox( + # Translators: input type for a wireless key + RadioButton(Id("passphrase"), _("&Passphrase")), + HSpacing(1), + # Translators: input type for a wireless key + RadioButton(Id("ascii"), _("&ASCII")), + HSpacing(1), + # Translators: input type for a wireless key + # (Hexadecimal) + RadioButton(Id("hex"), _("&Hexadecimal")) + ) + ), + VSpacing(0.2), + @key_widget + ) + end + + def enable + @key_widget.enable + end + + def disable + @key_widget.disable + end + end + + class WirelessEncryptionKey < CWM::Password + def initialize(settings) + @settings = settings + end + + def label + _("&Encryption Key") + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb new file mode 100644 index 000000000..c9097a8af --- /dev/null +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -0,0 +1,121 @@ +require "cwm/common_widgets" +require "cwm/custom_widget" +require "yast2/feedback" + +Yast.import "String" + +module Y2Network + module Widgets + class WirelessEssid < CWM::CustomWidget + def initialize(settings) + @settings = settings + textdomain = "network" + end + + def contents + HBox( + essid, + VBox( + VSpacing(1), + scan + ) + ) + end + + def essid + @essid ||= WirelessEssidName.new(@settings) + end + + def scan + @scan ||= WirelessScan.new(@settings, update: essid) + end + end + + class WirelessEssidName < CWM::ComboBox + def initialize(settings) + @settings = settings + end + + def label + _("Ne&twork Name (ESSID)") + end + + def init + self.value = @settings.essid.to_s + Yast::UI.ChangeWidget(Id(widget_id), :ValidChars, valid_chars) + end + + def opt + [:editable] + end + + def update_essid_list(networks) + change_items(networks.map {|n| [n, n]}) + end + + private + + def valid_chars + Yast::String.CPrint + end + end + + class WirelessScan < CWM::PushButton + def initialize(settings, update:) + @settings = settings + @update_widget = update + end + + def label + _("Scan Network") + end + + def handle + networks = essid_list + + Yast2::Feedback.show("Obtaining essid list", "Scanning network") do |f| + networks = essid_list + log.info("Found networks: #{networks}") + end + + return unless @update_widget + @update_widget.update_essid_list(networks) + nil + end + + def obtained_networks(networks) + output = "
    " + networks.map { |n| output << "
  • #{n}
    • " } + output << "
" + output + end + + def essid_list + command = "#{link_up} && #{scan} | #{grep_and_cut_essid} | #{sort}" + + output = Yast::SCR.Execute(Yast::Path.new(".target.bash_output"), command) + output["stdout"].split("\n") + end + + def sort + "/usr/bin/sort -u" + end + + def grep_and_cut_essid + "/usr/bin/grep ESSID | /usr/bin/cut -d':' -f2 | /usr/bin/cut -d'\"' -f2" + end + + def link_up + "/usr/sbin/ip link set #{interface} up" + end + + def scan + "/usr/sbin/iwlist #{interface} scan" + end + + def interface + @settings.name + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb new file mode 100644 index 000000000..76e849c8c --- /dev/null +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -0,0 +1,109 @@ +require "cwm/common_widgets" + +module Y2Network + module Widgets + class WirelessChannel < CWM::ComboBox + def initialize(settings) + @settings = settings + + textdomain "network" + end + + def init + disable + end + + def label + _("&Channel") + end + + def opt + [:hstretch] + end + + def items + 1.upto(14).map { |c| [c.to_s, c.to_s] }.prepend(["", _("Automatic")]) + end + end + + class WirelessBitRate < CWM::ComboBox + def initialize(settings) + @settings = settings + + textdomain "network" + end + + def opt + [:hstretch] + end + + def label + _("B&it Rate") + end + + def items + bitrates.map { |b| [b.to_s, b.to_s] }.prepend(["", _("Automatic")]) + end + + private + + def bitrates + [54,48,36,24,18,12,11,9,6,5.5,2,1] + end + end + + class WirelessAccessPoint< CWM::InputField + def initialize(settings) + @settings = settings + end + + def opt + [:hstretch] + end + + def label + _("&Access Point") + end + + def init + self.value = @settings.access_point + end + end + + class WirelessPowerManagement < CWM::CheckBox + def initialize(settings) + @settings = settings + end + + def label + _("Use &Power Management") + end + + def init + self.value = true + end + end + + class WirelessAPScanMode < CWM::IntField + def initialize(settings) + @settings = settings + end + + def opt + [:hstretch] + end + + def label + _("AP ScanMode") + end + + def minimum + 0 + end + + def maximum + 2 + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_mode.rb b/src/lib/y2network/widgets/wireless_mode.rb new file mode 100644 index 000000000..b8ebf13d9 --- /dev/null +++ b/src/lib/y2network/widgets/wireless_mode.rb @@ -0,0 +1,28 @@ +require "cwm/common_widgets" + +module Y2Network + module Widgets + class WirelessMode < CWM::ComboBox + def initialize(config) + @config = config + textdomain "network" + end + + def label + _("O&perating Mode") + end + + def init + self.value = @config.mode + end + + def opt + [:notify, :hstretch] + end + + def items + ["Add-hoc", "Managed", "Master"].map { |m| [m, m] } + end + end + end +end From d3364784c91dd5b7cd594670d6f89f0a34c5b974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Tue, 13 Aug 2019 09:32:44 +0100 Subject: [PATCH 155/471] Changes based on code review. --- src/lib/y2network/connection_config/ctc.rb | 23 +++++++++++++++++-- src/lib/y2network/connection_config/qeth.rb | 18 ++++++++++++++- src/lib/y2network/interface_type.rb | 2 +- .../connection_config_readers/base.rb | 1 - .../connection_config_readers/ctc.rb | 5 ---- .../connection_config_writers/base.rb | 1 - .../connection_config_writers/ctc.rb | 5 ---- 7 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/lib/y2network/connection_config/ctc.rb b/src/lib/y2network/connection_config/ctc.rb index dec6acab8..43685bbc2 100644 --- a/src/lib/y2network/connection_config/ctc.rb +++ b/src/lib/y2network/connection_config/ctc.rb @@ -21,13 +21,32 @@ module Y2Network module ConnectionConfig - # Configuration for ctc connections + # Configuration for ctc connections. + # + # @note The use of this connection is deprecated or not recommended as it + # will not be officially supported in future SLE versions. class Ctc < Base + # For CCW devices and CCW group devices, this device ID is the device + # bus-ID. + # + # The device bus-ID is of the format 0.., + # for example, 0.0.8000. + # + # The CTCM device driver requires two I/O subchannels for each interface, + # a read subchannel and a write subchannel + # + # @see https://www.ibm.com/developerworks/linux/linux390/index.html # @return [String] read bus id attr_accessor :read_channel # @return [String] write bus id attr_accessor :write_channel - # @return [Integer] connection protocol + # @return [Integer] connection protocol (0, 1, 3, or 4) + # 0 Compatibility with peers other than OS/390®. + # 1 Enhanced package checking for Linux peers. + # 3 For compatibility with OS/390 or z/OS peers. + # 4 For MPC connections to VTAM on traditional mainframe operating systems. + # @see https://www.ibm.com/support/knowledgecenter/en/linuxonibm/com.ibm.linux.z.ljdd/ljdd_t_ctcm_wrk_protocol.html + # @see https://github.com/SUSE/s390-tools/blob/master/ctc_configure#L16 attr_accessor :protocol end end diff --git a/src/lib/y2network/connection_config/qeth.rb b/src/lib/y2network/connection_config/qeth.rb index 9ebfd78c2..4a548c09a 100644 --- a/src/lib/y2network/connection_config/qeth.rb +++ b/src/lib/y2network/connection_config/qeth.rb @@ -23,6 +23,22 @@ module Y2Network module ConnectionConfig # Configuration for qeth connections class Qeth < Base + # For CCW devices and CCW group devices, this device ID is the device + # bus-ID. + # + # The device bus-ID is of the format 0.., + # for example, 0.0.8000. + # + # The qeth device driver requires three I/O subchannels for each + # HiperSockets CHPID or OSA-ExpressCHPID in QDIO mode. + # + # One subchannel is for control reads, one for control writes, and the + # third is for data. + # + # @example enable a qeth interface (persistently) + # chzdev --enable qeth 0.0.a000:0.0.a001:0.0.a002 + # + # @see https://www.ibm.com/developerworks/linux/linux390/index.html # @return [String] read bus id attr_accessor :read_channel # @return [String] write bus id @@ -31,7 +47,7 @@ class Qeth < Base attr_accessor :data_channel # @return [Boolean] whether layer2 is enabled or not attr_accessor :layer2 - # @return [Integer] port number + # @return [Integer] port number (0 or 1) attr_accessor :port_number # Constructor diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index ce7247710..617bceb16 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -132,7 +132,7 @@ def method_missing(method_name, *arguments, &block) LCS = new(N_("LCS"), "lcs") # HiperSockets s390 network device HSI = new(N_("HSI"), "hsi") - # Channel To Channel + # Channel To Channel. S390 specific CTC = new(N_("CTC"), "ctc") # FICON-attached direct access storage devices. s390 specific FICON = new(N_("FICON"), "ficon") diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index efb25e78b..5f96f80e7 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -76,7 +76,6 @@ def connection_class # # @param _conn [Y2Network::ConnectionConfig::Base] def update_connection_config(_conn) - raise NotImplementedError end # Returns the IPs configuration from the file diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb b/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb index feffab750..44afadb99 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb @@ -25,11 +25,6 @@ module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Ctc object given a # Sysconfig::InterfaceFile object. class Ctc < Base - private - - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config - def update_connection_config(_conn) - end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index f1dffb075..e6082198a 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -57,7 +57,6 @@ def write(conn) # # @param _conn [Y2Network::ConnectionConfig::Base] def update_file(_conn) - raise NotImplementedError end # Adds IP addresses diff --git a/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb b/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb index e98105579..59e7b670b 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb @@ -25,11 +25,6 @@ module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Ctc # object to the underlying system. class Ctc < Base - private - - # @see Y2Network::ConnectionConfigWriters::Base#update_file - def update_file(_conn) - end end end end From c5cbeac81371c966d14f351411c41699bbb85232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 12 Aug 2019 08:51:17 +0100 Subject: [PATCH 156/471] Added usb connection config. --- src/lib/y2network/connection_config/usb.rb | 28 +++++++++++ .../connection_config_readers/usb.rb | 31 ++++++++++++ .../connection_config_writers/usb.rb | 31 ++++++++++++ .../scr_read/etc/sysconfig/network/ifcfg-usb0 | 3 ++ test/y2network/connection_config/usb_test.rb | 32 ++++++++++++ .../connection_config_readers/usb_test.rb | 47 +++++++++++++++++ .../connection_config_writers/usb_test.rb | 50 +++++++++++++++++++ 7 files changed, 222 insertions(+) create mode 100644 src/lib/y2network/connection_config/usb.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/usb.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/usb.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-usb0 create mode 100644 test/y2network/connection_config/usb_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/usb_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/usb_test.rb diff --git a/src/lib/y2network/connection_config/usb.rb b/src/lib/y2network/connection_config/usb.rb new file mode 100644 index 000000000..504099102 --- /dev/null +++ b/src/lib/y2network/connection_config/usb.rb @@ -0,0 +1,28 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for Usb connections + class Usb < Base + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/usb.rb b/src/lib/y2network/sysconfig/connection_config_readers/usb.rb new file mode 100644 index 000000000..961cfbdca --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/usb.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/ethernet" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Usb object given a + # Sysconfig::InterfaceFile object. + class Usb < Ethernet + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/usb.rb b/src/lib/y2network/sysconfig/connection_config_writers/usb.rb new file mode 100644 index 000000000..abba09d8c --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/usb.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/ethernet" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Usb + # object to the underlying system. + class Usb < Ethernet + end + end + end +end diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-usb0 b/test/data/scr_read/etc/sysconfig/network/ifcfg-usb0 new file mode 100644 index 000000000..38caa4cb3 --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-usb0 @@ -0,0 +1,3 @@ +BOOTPROTO='static' +IPADDR='192.168.231.33/24' +STARTMODE='auto' diff --git a/test/y2network/connection_config/usb_test.rb b/test/y2network/connection_config/usb_test.rb new file mode 100644 index 000000000..b095e6755 --- /dev/null +++ b/test/y2network/connection_config/usb_test.rb @@ -0,0 +1,32 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/usb" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Usb do + subject(:config) { described_class.new } + + describe "#type" do + it "returns 'usb'" do + expect(config.type).to eq(Y2Network::InterfaceType::USB) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/usb_test.rb b/test/y2network/sysconfig/connection_config_readers/usb_test.rb new file mode 100644 index 000000000..f1b289b8e --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/usb_test.rb @@ -0,0 +1,47 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/usb" +require "y2network/sysconfig/interface_file" +require "y2network/boot_protocol" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Usb do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "usb0" } + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns an usb connection config object" do + usb = handler.connection_config + expect(usb.interface).to eq("usb0") + expect(usb.ip.address).to eq(Y2Network::IPAddress.from_string("192.168.231.33/24")) + expect(usb.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/usb_test.rb b/test/y2network/sysconfig/connection_config_writers/usb_test.rb new file mode 100644 index 000000000..175b497e4 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/usb_test.rb @@ -0,0 +1,50 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/usb" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/usb" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Usb do + subject(:handler) { described_class.new(file) } + + let(:conn) do + Y2Network::ConnectionConfig::Usb.new.tap do |c| + c.name = "usb1" + c.interface = "usb1" + c.bootproto = Y2Network::BootProtocol::DHCP + c.startmode = Y2Network::Startmode.create("manual") + end + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "dhcp", + startmode: "manual" + ) + end + end +end From 3ff75b888152c55b7c788c330711844770f0aa11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Tue, 13 Aug 2019 10:12:44 +0100 Subject: [PATCH 157/471] Changes based on code review. --- src/lib/y2network/sysconfig/connection_config_readers/usb.rb | 4 ++-- src/lib/y2network/sysconfig/connection_config_writers/usb.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/usb.rb b/src/lib/y2network/sysconfig/connection_config_readers/usb.rb index 961cfbdca..19d03a9b5 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/usb.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/usb.rb @@ -17,14 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_readers/ethernet" +require "y2network/sysconfig/connection_config_readers/base" module Y2Network module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Usb object given a # Sysconfig::InterfaceFile object. - class Usb < Ethernet + class Usb < Base end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/usb.rb b/src/lib/y2network/sysconfig/connection_config_writers/usb.rb index abba09d8c..d16f4abb2 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/usb.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/usb.rb @@ -17,14 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_writers/ethernet" +require "y2network/sysconfig/connection_config_writers/base" module Y2Network module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Usb # object to the underlying system. - class Usb < Ethernet + class Usb < Base end end end From 65702041bf68a0e89cef33308d5839d54e4c2b54 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 13 Aug 2019 13:46:55 +0200 Subject: [PATCH 158/471] fix showing popup --- src/lib/y2network/widgets/wireless_essid.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb index c9097a8af..ceb5579e2 100644 --- a/src/lib/y2network/widgets/wireless_essid.rb +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -73,7 +73,7 @@ def label def handle networks = essid_list - Yast2::Feedback.show("Obtaining essid list", "Scanning network") do |f| + Yast2::Feedback.show("Obtaining essid list", headline: "Scanning network") do |f| networks = essid_list log.info("Found networks: #{networks}") end From ed11d563eb55146f79658442eadb48007b7f23ad Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 13 Aug 2019 13:48:34 +0200 Subject: [PATCH 159/471] do not forget value after scanning essid --- src/lib/y2network/widgets/wireless_essid.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb index ceb5579e2..5b98c499e 100644 --- a/src/lib/y2network/widgets/wireless_essid.rb +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -50,7 +50,9 @@ def opt end def update_essid_list(networks) + old_value = value change_items(networks.map {|n| [n, n]}) + self.value = old_value end private From da8bec0ec08303d03c35fbe1b7e1ec9832f5cdb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 12 Aug 2019 07:51:34 +0100 Subject: [PATCH 160/471] Added LCS connection config. --- src/lib/y2network/connection_config/lcs.rb | 43 ++++++++++++++++ .../connection_config_readers/lcs.rb | 36 +++++++++++++ .../connection_config_writers/lcs.rb | 36 +++++++++++++ .../scr_read/etc/sysconfig/network/ifcfg-eth6 | 4 ++ test/y2network/connection_config/lcs_test.rb | 30 +++++++++++ .../connection_config_readers/lcs_test.rb | 49 ++++++++++++++++++ .../connection_config_writers/lcs_test.rb | 50 +++++++++++++++++++ 7 files changed, 248 insertions(+) create mode 100644 src/lib/y2network/connection_config/lcs.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_readers/lcs.rb create mode 100644 src/lib/y2network/sysconfig/connection_config_writers/lcs.rb create mode 100644 test/data/scr_read/etc/sysconfig/network/ifcfg-eth6 create mode 100644 test/y2network/connection_config/lcs_test.rb create mode 100644 test/y2network/sysconfig/connection_config_readers/lcs_test.rb create mode 100644 test/y2network/sysconfig/connection_config_writers/lcs_test.rb diff --git a/src/lib/y2network/connection_config/lcs.rb b/src/lib/y2network/connection_config/lcs.rb new file mode 100644 index 000000000..22233d69c --- /dev/null +++ b/src/lib/y2network/connection_config/lcs.rb @@ -0,0 +1,43 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/connection_config/base" + +module Y2Network + module ConnectionConfig + # Configuration for lcs connections + class Lcs < Base + # @return [String] read bus id + attr_accessor :read_channel + # @return [String] write bus id + attr_accessor :write_channel + # @return [Integer] connection protocol + attr_accessor :protocol + # @return [Integer] lcs timeout + attr_accessor :timeout + + # Constructor + def initialize + super() + @protocol = 0 + @timeout = 5 + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb b/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb new file mode 100644 index 000000000..4d6ab5474 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb @@ -0,0 +1,36 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_readers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigReaders + # This class is able to build a ConnectionConfig::Lcs object given a + # Sysconfig::InterfaceFile object. + class Lcs < Base + private + + # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + def update_connection_config(_conn) + end + end + end + end +end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb b/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb new file mode 100644 index 000000000..23acd6451 --- /dev/null +++ b/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb @@ -0,0 +1,36 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/sysconfig/connection_config_writers/base" + +module Y2Network + module Sysconfig + module ConnectionConfigWriters + # This class is responsible for writing the information from a ConnectionConfig::Lcs + # object to the underlying system. + class Lcs < Base + private + + # @see Y2Network::ConnectionConfigWriters::Base#update_file + def update_file(_conn) + end + end + end + end +end diff --git a/test/data/scr_read/etc/sysconfig/network/ifcfg-eth6 b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth6 new file mode 100644 index 000000000..bdc3361fb --- /dev/null +++ b/test/data/scr_read/etc/sysconfig/network/ifcfg-eth6 @@ -0,0 +1,4 @@ +# LCS interface +STARTMODE='auto' +BOOTPROTO='static' +IPADDR='192.168.70.100/24' diff --git a/test/y2network/connection_config/lcs_test.rb b/test/y2network/connection_config/lcs_test.rb new file mode 100644 index 000000000..b72d94210 --- /dev/null +++ b/test/y2network/connection_config/lcs_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/connection_config/lcs" +require "y2network/interface_type" + +describe Y2Network::ConnectionConfig::Lcs do + describe "#type" do + it "returns 'lcs'" do + expect(subject.type).to eq(Y2Network::InterfaceType::LCS) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_readers/lcs_test.rb b/test/y2network/sysconfig/connection_config_readers/lcs_test.rb new file mode 100644 index 000000000..94a510d5d --- /dev/null +++ b/test/y2network/sysconfig/connection_config_readers/lcs_test.rb @@ -0,0 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" +require "y2network/sysconfig/connection_config_readers/lcs" +require "y2network/sysconfig/interface_file" +require "y2network/boot_protocol" + +describe Y2Network::Sysconfig::ConnectionConfigReaders::Lcs do + subject(:handler) { described_class.new(file) } + + let(:scr_root) { File.join(DATA_PATH, "scr_read") } + + around do |example| + change_scr_root(scr_root, &example) + end + + let(:interface_name) { "eth6" } + + let(:file) do + Y2Network::Sysconfig::InterfaceFile.find(interface_name).tap(&:load) + end + + describe "#connection_config" do + it "returns a lcs connection config object" do + lcs = handler.connection_config + expect(lcs.type).to eql(Y2Network::InterfaceType::LCS) + expect(lcs.interface).to eq("eth6") + expect(lcs.ip.address).to eq(Y2Network::IPAddress.from_string("192.168.70.100/24")) + expect(lcs.bootproto).to eq(Y2Network::BootProtocol::STATIC) + end + end +end diff --git a/test/y2network/sysconfig/connection_config_writers/lcs_test.rb b/test/y2network/sysconfig/connection_config_writers/lcs_test.rb new file mode 100644 index 000000000..44d56ba45 --- /dev/null +++ b/test/y2network/sysconfig/connection_config_writers/lcs_test.rb @@ -0,0 +1,50 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../../test_helper" + +require "y2network/sysconfig/connection_config_writers/lcs" +require "y2network/startmode" +require "y2network/boot_protocol" +require "y2network/connection_config/lcs" + +describe Y2Network::Sysconfig::ConnectionConfigWriters::Lcs do + subject(:handler) { described_class.new(file) } + + let(:conn) do + Y2Network::ConnectionConfig::Lcs.new.tap do |c| + c.name = "eth0" + c.interface = "eth0" + c.bootproto = Y2Network::BootProtocol::DHCP + c.startmode = Y2Network::Startmode.create("auto") + end + end + + let(:file) { Y2Network::Sysconfig::InterfaceFile.new(conn.name) } + + describe "#write" do + it "writes common properties" do + handler.write(conn) + expect(file).to have_attributes( + bootproto: "dhcp", + startmode: "auto" + ) + end + end +end From f2665c84cbed8b021facd94ca838bec6996737d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 14 Aug 2019 09:41:20 +0100 Subject: [PATCH 161/471] Changes based on CR. --- src/lib/y2network/connection_config/ctc.rb | 15 +++++--- src/lib/y2network/connection_config/lcs.rb | 35 ++++++++++++++++--- .../connection_config_readers/dummy.rb | 4 +-- .../connection_config_readers/hsi.rb | 4 +-- .../connection_config_readers/lcs.rb | 5 --- .../connection_config_readers/qeth.rb | 4 +-- .../connection_config_writers/hsi.rb | 4 +-- .../connection_config_writers/lcs.rb | 5 --- .../connection_config_writers/qeth.rb | 4 +-- 9 files changed, 51 insertions(+), 29 deletions(-) diff --git a/src/lib/y2network/connection_config/ctc.rb b/src/lib/y2network/connection_config/ctc.rb index 43685bbc2..26c9b8cf2 100644 --- a/src/lib/y2network/connection_config/ctc.rb +++ b/src/lib/y2network/connection_config/ctc.rb @@ -26,19 +26,24 @@ module ConnectionConfig # @note The use of this connection is deprecated or not recommended as it # will not be officially supported in future SLE versions. class Ctc < Base - # For CCW devices and CCW group devices, this device ID is the device - # bus-ID. + # Most I/O devices on a s390 system are typically driven through the + # channel I/O mechanism. + # + # The s390-tools provides a set of commands for working with CCW devices + # and CCW group devices, these commands use a device ID which is the + # device bus-ID # # The device bus-ID is of the format 0.., # for example, 0.0.8000. # + # @see https://www.ibm.com/developerworks/linux/linux390/documentation_suse.html + # # The CTCM device driver requires two I/O subchannels for each interface, # a read subchannel and a write subchannel # - # @see https://www.ibm.com/developerworks/linux/linux390/index.html - # @return [String] read bus id + # @return [String] read device bus id attr_accessor :read_channel - # @return [String] write bus id + # @return [String] write device bus id attr_accessor :write_channel # @return [Integer] connection protocol (0, 1, 3, or 4) # 0 Compatibility with peers other than OS/390®. diff --git a/src/lib/y2network/connection_config/lcs.rb b/src/lib/y2network/connection_config/lcs.rb index 22233d69c..754a64dfc 100644 --- a/src/lib/y2network/connection_config/lcs.rb +++ b/src/lib/y2network/connection_config/lcs.rb @@ -23,13 +23,40 @@ module Y2Network module ConnectionConfig # Configuration for lcs connections class Lcs < Base - # @return [String] read bus id + # Most I/O devices on a s390 system are typically driven through the + # channel I/O mechanism. + # + # The s390-tools provides a set of commands for working with CCW devices + # and CCW group devices, these commands use a device ID which is the + # device bus-ID + # + # The device bus-ID is of the format 0.., + # for example, 0.0.8000. + # + # @see https://www.ibm.com/developerworks/linux/linux390/documentation_suse.html + # + # The LCS devices drivers requires two I/O subchannels for each interface, + # a read subchannel and a write subchannel and is very similar to the + # S390 CTC interface. + # + # @return [String] read device bus id attr_accessor :read_channel - # @return [String] write bus id + # @return [String] write device bus id attr_accessor :write_channel - # @return [Integer] connection protocol + # @return [Integer] connection protocol (0, 1, 3, or 4) + # 0 Compatibility with peers other than OS/390®. + # 1 Enhanced package checking for Linux peers. + # 3 For compatibility with OS/390 or z/OS peers. + # 4 For MPC connections to VTAM on traditional mainframe operating systems. + # @see https://github.com/SUSE/s390-tools/blob/master/ctc_configure#L16 + # + # # FIXME: At lease in linuxrc the protocol is not needed anymore for lcs + # interfaces (once replaced ctc_configure by chzdev) attr_accessor :protocol - # @return [Integer] lcs timeout + # The time the driver wait for a reply issuing a LAN command. + # + # @return [Integer] lcs lancmd timeout (default 5sg) + # @see https://www.ibm.com/support/knowledgecenter/en/linuxonibm/com.ibm.linux.z.ljdd/ljdd_t_lcs_wrk_timeout.html attr_accessor :timeout # Constructor diff --git a/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb b/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb index b6fbd09fa..8cf54a7ed 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb @@ -17,14 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_readers/ethernet" +require "y2network/sysconfig/connection_config_readers/base" module Y2Network module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Dummy object given a # Sysconfig::InterfaceFile object. - class Dummy < Ethernet + class Dummy < Base end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb b/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb index 2cab7e2cc..ff39ce9cf 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb @@ -17,14 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_readers/ethernet" +require "y2network/sysconfig/connection_config_readers/base" module Y2Network module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Hsi object given a # Sysconfig::InterfaceFile object. - class Hsi < Ethernet + class Hsi < Base end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb b/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb index 4d6ab5474..9b7a50a6b 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb @@ -25,11 +25,6 @@ module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Lcs object given a # Sysconfig::InterfaceFile object. class Lcs < Base - private - - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config - def update_connection_config(_conn) - end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb b/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb index 9dc140a82..3b08c4b26 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb @@ -17,14 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_readers/ethernet" +require "y2network/sysconfig/connection_config_readers/base" module Y2Network module Sysconfig module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Qeth object given a # Sysconfig::InterfaceFile object. - class Qeth < Ethernet + class Qeth < Base end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb b/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb index a0852c0e0..46eaf2033 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb @@ -17,14 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_writers/ethernet" +require "y2network/sysconfig/connection_config_writers/base" module Y2Network module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a # ConnectionConfig::Hsi object to the underlying system. - class Hsi < Ethernet + class Hsi < Base end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb b/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb index 23acd6451..98325bee7 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb @@ -25,11 +25,6 @@ module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Lcs # object to the underlying system. class Lcs < Base - private - - # @see Y2Network::ConnectionConfigWriters::Base#update_file - def update_file(_conn) - end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb b/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb index 2841fad46..62ca35e47 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb @@ -17,14 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/sysconfig/connection_config_writers/ethernet" +require "y2network/sysconfig/connection_config_writers/base" module Y2Network module Sysconfig module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Qeth # object to the underlying system. - class Qeth < Ethernet + class Qeth < Base end end end From eedbbcddfce116f2bd112645dbb437b6766dd88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 14 Aug 2019 09:56:11 +0100 Subject: [PATCH 162/471] Fixed typo --- src/lib/y2network/connection_config/lcs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/lcs.rb b/src/lib/y2network/connection_config/lcs.rb index 754a64dfc..58ffe838b 100644 --- a/src/lib/y2network/connection_config/lcs.rb +++ b/src/lib/y2network/connection_config/lcs.rb @@ -55,7 +55,7 @@ class Lcs < Base attr_accessor :protocol # The time the driver wait for a reply issuing a LAN command. # - # @return [Integer] lcs lancmd timeout (default 5sg) + # @return [Integer] lcs lancmd timeout (default 5s) # @see https://www.ibm.com/support/knowledgecenter/en/linuxonibm/com.ibm.linux.z.ljdd/ljdd_t_lcs_wrk_timeout.html attr_accessor :timeout From 4aa6298f14ed5a6581395491f22cbe8ef0fd74b7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 14 Aug 2019 15:22:43 +0200 Subject: [PATCH 163/471] add wireless to tab and separate config and authentication --- src/include/network/lan/wizards.rb | 25 +------- src/lib/y2network/dialogs/edit_interface.rb | 11 +++- src/lib/y2network/dialogs/wireless.rb | 50 --------------- .../interface_config_builders/wireless.rb | 1 - src/lib/y2network/widgets/wireless.rb | 55 +--------------- src/lib/y2network/widgets/wireless_auth.rb | 64 +++++++++++++++++++ src/lib/y2network/widgets/wireless_tab.rb | 35 ++++++++++ 7 files changed, 109 insertions(+), 132 deletions(-) delete mode 100644 src/lib/y2network/dialogs/wireless.rb create mode 100644 src/lib/y2network/widgets/wireless_auth.rb create mode 100644 src/lib/y2network/widgets/wireless_tab.rb diff --git a/src/include/network/lan/wizards.rb b/src/include/network/lan/wizards.rb index 90be78697..fa70fefc3 100644 --- a/src/include/network/lan/wizards.rb +++ b/src/include/network/lan/wizards.rb @@ -181,42 +181,19 @@ def AddressSequence(which, builder:) "address" => -> { AddressDialog(builder: builder) }, "hosts" => -> { HostsMainDialog(false) }, "s390" => -> { S390Dialog(builder: builder) }, - "wire" => -> { WirelessDialog() }, - "expert" => -> { WirelessExpertDialog() }, - "keys" => -> { WirelessKeysDialog() }, - "eap" => -> { WirelessWpaEapDialog() }, - "eap-details" => -> { WirelessWpaEapDetailsDialog() }, "commit" => [-> { Commit(builder: builder) }, true] } - ws_start = which == "wire" ? "wire" : "address" sequence = { - "ws_start" => ws_start, + "ws_start" => "address", "address" => { abort: :abort, next: "commit", - wire: "wire", hosts: "hosts", s390: "s390", - hardware: :hardware }, "s390" => { abort: :abort, next: "address" }, "hosts" => { abort: :abort, next: "address" }, - "wire" => { - next: "commit", - expert: "expert", - keys: "keys", - eap: "eap", - abort: :abort - }, - "expert" => { next: "wire", abort: :abort }, - "keys" => { next: "wire", abort: :abort }, - "eap" => { - next: "commit", - details: "eap-details", - abort: :abort - }, - "eap-details" => { next: "eap", abort: :abort }, "commit" => { next: :next } } diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index 59da2d74b..1cced01c1 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -5,6 +5,7 @@ require "y2network/widgets/bridge_slaves_tab.rb" require "y2network/widgets/general_tab.rb" require "y2network/widgets/hardware_tab.rb" +require "y2network/widgets/wireless_tab.rb" Yast.import "LanItems" Yast.import "Label" @@ -27,9 +28,10 @@ def title end def contents - # if there is addr, make it initial + # if there is addr, make it initial unless for wifi, where first one should be wifi specific + # configs addr_tab = Widgets::AddressTab.new(@settings) - addr_tab.initial = true + addr_tab.initial = true unless @settings.type.wireless? tabs = case @settings.type.short_name when "vlan" @@ -41,6 +43,10 @@ def contents when "bond" [Widgets::GeneralTab.new(@settings), addr_tab, Widgets::HardwareTab.new(@settings), Widgets::BondSlavesTab.new(@settings)] + when "wlan" + wireless = Widgets::WirelessTab.new(@settings) + wireless.initial = true + [Widgets::GeneralTab.new(@settings), wireless, addr_tab, Widgets::HardwareTab.new(@settings)] else [Widgets::GeneralTab.new(@settings), addr_tab, Widgets::HardwareTab.new(@settings)] end @@ -56,7 +62,6 @@ def abort_button # removes back button when editing device, but keep it when this dialog follows adding # new interface def back_button - # TODO: decide operation based on builder @settings.newly_added? ? Yast::Label.BackButton : "" end end diff --git a/src/lib/y2network/dialogs/wireless.rb b/src/lib/y2network/dialogs/wireless.rb deleted file mode 100644 index 9f3592d5f..000000000 --- a/src/lib/y2network/dialogs/wireless.rb +++ /dev/null @@ -1,50 +0,0 @@ -require "yast" -require "cwm/dialog" -require "y2network/widgets/wireless" -require "y2network/dialogs/wireless_eap" - -module Y2Network - module Dialogs - class Wireless < CWM::Dialog - # @param settings [InterfaceBuilder] object holding interface configuration - # modified by the dialog. - def initialize(settings) - @settings = settings - - textdomain "network" - end - - def title - _("Wireless Network Card Configuration") - end - - def contents - HBox( - HSpacing(4), - wireless_widget, - HSpacing(4) - ) - end - - def settings - @settings - end - - def run - ret = super - if settings.auth_mode == "wpa-eap" - ret = Y2Network::Dialogs::WirelessEap.new(settings).run - return :redraw if ret == :back - end - - settings.save if ret == :next - end - - private - - def wireless_widget - @wireless_widget ||= Y2Network::Widgets::Wireless.new(settings) - end - end - end -end diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index 95559226c..5d3c1669c 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -44,7 +44,6 @@ def auth_mode def auth_mode=(mode) @config["WIRELESS_AUTH_MODE"] = mode @connection_config.auth_mode = mode - puts @config.inspect end def eap_mode diff --git a/src/lib/y2network/widgets/wireless.rb b/src/lib/y2network/widgets/wireless.rb index 803fb8d83..7db705e9f 100644 --- a/src/lib/y2network/widgets/wireless.rb +++ b/src/lib/y2network/widgets/wireless.rb @@ -1,9 +1,5 @@ require "y2network/widgets/wireless_essid" -require "y2network/widgets/wireless_eap" -require "y2network/widgets/wireless_encryption" require "y2network/widgets/wireless_mode" -require "y2network/widgets/wireless_auth_mode" -require "y2network/dialogs/wireless_wep_keys" require "y2network/dialogs/wireless_expert_settings" module Y2Network @@ -13,21 +9,6 @@ class Wireless < CWM::CustomWidget def initialize(settings) @settings = settings - self.handle_all_events = true - end - - def init - end - - def handle(event) - case event["ID"] - when auth_mode_widget.widget_id - refresh - when mode_widget.widget_id - refresh - end - - nil end def contents @@ -46,20 +27,12 @@ def contents # Text entry label essid_widget, VSpacing(0.2), - auth_mode_widget, - VSpacing(0.2), - encryption_widget, + expert_settings_widget, VSpacing(0.5) ), HSpacing(2) ) ), - VSpacing(0.5), - HBox( - expert_settings_widget, - HSpacing(0.5), - wep_keys_widget - ), VSpacing(0.5) ) end @@ -91,21 +64,9 @@ def essid_widget @essid_widget ||= Y2Network::Widgets::WirelessEssid.new(settings) end - def auth_mode_widget - @auth_mode_widget ||= Y2Network::Widgets::WirelessAuthMode.new(settings) - end - - def encryption_widget - @encryption_widget ||= Y2Network::Widgets::WirelessEncryption.new(settings) - end - def expert_settings_widget @expert_settings_widget ||= Y2Network::Widgets::WirelessExpertSettings.new(settings) end - - def wep_keys_widget - @wep_keys_widget ||= Y2Network::Widgets::WirelessWepKeys.new(settings) - end end class WirelessExpertSettings < CWM::PushButton @@ -123,19 +84,5 @@ def handle nil end end - - class WirelessWepKeys < CWM::PushButton - def initialize(settings) - @settings = settings - end - - def label - _("&WEP Keys") - end - - def handle - Y2Network::Dialogs::WirelessWepKeys.run(@settings) - end - end end end diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb new file mode 100644 index 000000000..c8a3b5542 --- /dev/null +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -0,0 +1,64 @@ +require "y2network/widgets/wireless_encryption" +require "y2network/widgets/wireless_auth_mode" +require "y2network/dialogs/wireless_wep_keys" + +module Y2Network + module Widgets + class WirelessAuth < CWM::CustomWidget + attr_reader :settings + + def initialize(settings) + @settings = settings + self.handle_all_events = true + end + + def handle(event) + # TODO: replace point manipulation + end + + def contents + Frame( + _("Wireless Authentication"), + VBox( + VSpacing(0.5), + auth_mode_widget, + VSpacing(0.2), + # TODO Replace point to support fully EAP in one widget + encryption_widget, + VSpacing(0.2), + wep_keys_widget, + VSpacing(0.5) + ) + ) + end + + private + + def auth_mode_widget + @auth_mode_widget ||= Y2Network::Widgets::WirelessAuthMode.new(settings) + end + + def encryption_widget + @encryption_widget ||= Y2Network::Widgets::WirelessEncryption.new(settings) + end + + def wep_keys_widget + @wep_keys_widget ||= WirelessWepKeys.new(settings) + end + + class WirelessWepKeys < CWM::PushButton + def initialize(settings) + @settings = settings + end + + def label + _("&WEP Keys") + end + + def handle + Y2Network::Dialogs::WirelessWepKeys.run(@settings) + end + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_tab.rb b/src/lib/y2network/widgets/wireless_tab.rb new file mode 100644 index 000000000..6c6bddd22 --- /dev/null +++ b/src/lib/y2network/widgets/wireless_tab.rb @@ -0,0 +1,35 @@ +require "yast" +require "cwm/tabs" + +# used widgets +require "y2network/widgets/wireless" +require "y2network/widgets/wireless_auth" + +module Y2Network + module Widgets + class WirelessTab < CWM::Tab + def initialize(builder) + textdomain "network" + + @builder = builder + end + + def label + _("&Wireless Specific") + end + + def contents + VBox( + VSpacing(0.5), + Y2Network::Widgets::Wireless.new(@builder), + VSpacing(0.5), + Y2Network::Widgets::WirelessAuth.new(@builder), + VSpacing(0.5), + # TODO: wireless auth widget + VStretch() + ) + end + end + end +end + From a7dee9c321bb1c3a2439701984804a715fce9cac Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 14 Aug 2019 17:09:38 +0200 Subject: [PATCH 164/471] improve auth mode --- .../interface_config_builders/wireless.rb | 9 ++++ src/lib/y2network/widgets/wireless_auth.rb | 40 +++++++++++--- .../y2network/widgets/wireless_auth_mode.rb | 5 +- .../y2network/widgets/wireless_encryption.rb | 54 ------------------- .../y2network/widgets/wireless_password.rb | 29 ++++++++++ 5 files changed, 74 insertions(+), 63 deletions(-) delete mode 100644 src/lib/y2network/widgets/wireless_encryption.rb create mode 100644 src/lib/y2network/widgets/wireless_password.rb diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index 5d3c1669c..7ae339400 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -64,6 +64,15 @@ def access_point @connection_config.ap ) end + + def wpa_psk + @connection_config.wpa_psk + end + + def wpa_psk=(value) + # TODO select backend? + @connection_config.wpa_psk = value + end end end end diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index c8a3b5542..ec196ce14 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -1,4 +1,7 @@ -require "y2network/widgets/wireless_encryption" +require "cwm/custom_widget" +require "cwm/replace_point" + +require "y2network/widgets/wireless_password" require "y2network/widgets/wireless_auth_mode" require "y2network/dialogs/wireless_wep_keys" @@ -12,8 +15,15 @@ def initialize(settings) self.handle_all_events = true end + def init + refresh + end + def handle(event) - # TODO: replace point manipulation + return if event["ID"] != auth_mode_widget.widget_id + + refresh + nil end def contents @@ -23,10 +33,7 @@ def contents VSpacing(0.5), auth_mode_widget, VSpacing(0.2), - # TODO Replace point to support fully EAP in one widget - encryption_widget, - VSpacing(0.2), - wep_keys_widget, + replace_widget, VSpacing(0.5) ) ) @@ -34,12 +41,31 @@ def contents private + def refresh + case auth_mode_widget.value + when "no-encryption", "open" then replace_widget.replace(empty_auth_widget) + when "sharedkey" then replace_widget.replace(wep_keys_widget) + when "wpa-psk" then replace_widget.replace(encryption_widget) + when "wpa-eap" then nil # TODO: write it + else + raise "invalid value #{auth_mode_widget.value.inspect}" + end + end + + def replace_widget + @replace_widget ||= CWM::ReplacePoint.new(id: "wireless_replace_point", widget: empty_auth_widget) + end + + def empty_auth_widget + @empty_auth ||= CWM::Empty.new("wireless_empty") + end + def auth_mode_widget @auth_mode_widget ||= Y2Network::Widgets::WirelessAuthMode.new(settings) end def encryption_widget - @encryption_widget ||= Y2Network::Widgets::WirelessEncryption.new(settings) + @encryption_widget ||= Y2Network::Widgets::WirelessPassword.new(settings) end def wep_keys_widget diff --git a/src/lib/y2network/widgets/wireless_auth_mode.rb b/src/lib/y2network/widgets/wireless_auth_mode.rb index 8cd58f91c..5840fc4e4 100644 --- a/src/lib/y2network/widgets/wireless_auth_mode.rb +++ b/src/lib/y2network/widgets/wireless_auth_mode.rb @@ -24,12 +24,13 @@ def items ["no-encryption", _("No Encryption")], ["open", _("WEP - Open")], ["sharedkey", _("WEP - Shared Key")], - ["wpa-psk", _("WPA-PSK (WPA version 1 or 2)")], - ["wpa-eap", _("WPA-EAP (WPA version 1 or 2)")] + ["wpa-psk", _("WPA-PSK (\"home\")")], + ["wpa-eap", _("WPA-EAP (\"Enterprise\")")] ] end def help + # TODO: improve help text, mention all options and security problems with WEP "

WPA-EAP uses a RADIUS server to authenticate users. There\n" \ "are different methods in EAP to connect to the server and\n" \ "perform the authentication, namely TLS, TTLS, and PEAP.

\n" diff --git a/src/lib/y2network/widgets/wireless_encryption.rb b/src/lib/y2network/widgets/wireless_encryption.rb deleted file mode 100644 index 3b1867b1c..000000000 --- a/src/lib/y2network/widgets/wireless_encryption.rb +++ /dev/null @@ -1,54 +0,0 @@ -require "cwm/common_widgets" -require "cwm/custom_widget" - -module Y2Network - module Widgets - class WirelessEncryption < CWM::CustomWidget - def initialize(settings) - @settings = settings - @key_widget = WirelessEncryptionKey.new(settings) - end - - def contents - VBox( - # Translators: input type for a wireless key - # radio button group label - Left(Label(_("Key Input Type"))), - Left( - HBox( - # Translators: input type for a wireless key - RadioButton(Id("passphrase"), _("&Passphrase")), - HSpacing(1), - # Translators: input type for a wireless key - RadioButton(Id("ascii"), _("&ASCII")), - HSpacing(1), - # Translators: input type for a wireless key - # (Hexadecimal) - RadioButton(Id("hex"), _("&Hexadecimal")) - ) - ), - VSpacing(0.2), - @key_widget - ) - end - - def enable - @key_widget.enable - end - - def disable - @key_widget.disable - end - end - - class WirelessEncryptionKey < CWM::Password - def initialize(settings) - @settings = settings - end - - def label - _("&Encryption Key") - end - end - end -end diff --git a/src/lib/y2network/widgets/wireless_password.rb b/src/lib/y2network/widgets/wireless_password.rb new file mode 100644 index 000000000..063b661ad --- /dev/null +++ b/src/lib/y2network/widgets/wireless_password.rb @@ -0,0 +1,29 @@ +require "cwm/common_widgets" + +module Y2Network + module Widgets + class WirelessPassword < CWM::Password + def initialize(builder) + textdomain "network" + @builder = builder + end + + def label + _("Password") + end + + def init + self.value = @builder.wpa_psk + end + + def store + @builder.wpa_psk = value + end + + # TODO: write help text + + # TODO: write validation. From man page: You can enter it in hex digits (needs to be exactly + # 64 digits long) or as passphrase getting hashed (8 to 63 ASCII characters long). + end + end +end From 384af5713063f54164e66e70078996b9d44bcb3c Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Thu, 1 Aug 2019 10:51:32 +0200 Subject: [PATCH 165/471] Class for interface type detection. --- .../connection_configs_collection.rb | 8 + src/lib/y2network/interface_type.rb | 16 ++ src/lib/y2network/sysconfig/type_detector.rb | 108 ++++++++++++++ src/lib/y2network/type_detector.rb | 140 ++++++++++++++++++ 4 files changed, 272 insertions(+) create mode 100644 src/lib/y2network/sysconfig/type_detector.rb create mode 100644 src/lib/y2network/type_detector.rb diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index 5fa3f55ea..716c57a4a 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -53,6 +53,14 @@ def by_name(name) connection_configs.find { |c| c.name == name } end + # Returns a connection configuration tied to the given interface + # + # @param iface [Y2Network::Interface] + # @return [ConnectionConfig, nil] Connection config tied to the interface or nil if not found + def by_interface(iface) + connection_configs.find { |c| c.interface == iface } + end + # Adds or updates a connection configuration # # @note It uses the name to do the matching. diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index edd4119e9..0e92813fd 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -111,6 +111,8 @@ def method_missing(method_name, *arguments, &block) WIRELESS = new(N_("Wireless"), "wlan") # Infiniband card INFINIBAND = new(N_("Infiniband"), "ib") + # Infiniband card child device. Used in IPoIB (IP-over-InfiniBand) + INFINIBANDCHILD = new(N_("Infiniband Child"), "ibchild") # Bonding device BONDING = new(N_("Bonding"), "bond") # bridge device @@ -134,5 +136,19 @@ def method_missing(method_name, *arguments, &block) HSI = new(N_("HSI"), "hsi") # FICON-attached direct access storage devices. s390 specific FICON = new(N_("FICON"), "ficon") + # Point-to-Point Protocol + PPP = new(N_("Point-to-Point Protocol"), "ppp") + # Ip in Ip protocol + IPIP = new(N_("Ip-in-ip"), "ipip") + # IPv6 Tunnel interface + IPV6TNL = new(N_("IPv6 Tunnel"), "ip6tnl") + # IPv6 over IPv4 + SIT = new(N_("IPv6 over IPv4 Tunnel"), "sit") + # IP over IPv4 + GRE = new(N_("IP over IPv4 Tunnel"), "gre") + # Infrared + IRDA = new(N_("Infrared"), "irda") + # Loopback + LO = new(N_("Loopback"), "lo") end end diff --git a/src/lib/y2network/sysconfig/type_detector.rb b/src/lib/y2network/sysconfig/type_detector.rb new file mode 100644 index 000000000..6b4b557ce --- /dev/null +++ b/src/lib/y2network/sysconfig/type_detector.rb @@ -0,0 +1,108 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/interface_type" +require "y2network/type_detector" + +Yast.import "NetworkInterfaces" + +module Y2Network + module Sysconfig + # Detects type of given interface. New implementation of what was in + # @see Yast::NetworkInterfaces.GetType + class TypeDetector < Y2Network::TypeDetector + class << self + private + KEY_TO_TYPE = { + "ETHERDEVICE" => InterfaceType::VLAN, + "WIRELESS_MODE" => InterfaceType::WIRELESS, + "MODEM_DEVICE" => InterfaceType::PPP + }.freeze + + # Checks wheter iface type can be recognized by interface configuration + def type_by_config(iface) + devmap = devmap(iface) + return nil if !devmap + + type_by_key_value(devmap) || + type_by_key_existence(devmap) || + type_from_interfacetype(devmap) || + type_by_name(iface) + end + + def devmap(iface) + Yast::NetworkInterfaces.Read + Yast::NetworkInterfaces.devmap(iface) + end + + # Detects interface type according to type specific option + # + # @param devmap [Hash] a sysconfig configuration of an interface + # + # @return [Y2Network::InterfaceType, nil] particular type if recognized, nil otherwise + def type_by_key_existence(devmap) + key = KEY_TO_TYPE.keys.find { |k| devmap.include?(k) } + return KEY_TO_TYPE[key] if key + + nil + end + + # Detects interface type according to type specific option and its value + # + # @param devmap [Hash] a sysconfig configuration of an interface + # + # @return [Y2Network::InterfaceType, nil] particular type if recognized, nil otherwise + def type_by_key_value(devmap) + return InterfaceType::BONDING if devmap["BONDING_MASTER"] == "yes" + return InterfaceType::BRIDGE if devmap["BRIDGE"] == "yes" + return InterfaceType::WIRELESS if devmap["WIRELESS"] == "yes" + return InterfaceType.from_short_name(devmap["TUNNEL"]) if devmap["TUNNEL"] + + # in relation to original implementation ommited ENCAP option which leads to isdn + # and PPPMODE which leads to ppp. Neither of this type has been handled as + # "netcard" - see Yast::NetworkInterfaces for details + + nil + end + + # Detects interface type according to sysconfig's INTERFACETYPE option + # + # @param devmap [Hash] a sysconfig configuration of an interface + # + # @return [Y2Network::InterfaceType, nil] type according to INTERFACETYPE option + # value if recognized, nil otherwise + def type_from_interfacetype(devmap) + return InterfaceType::from_short_name(devmap["INTERFACETYPE"]) if devmap["INTERFACETYPE"] + nil + end + + # Distinguishes interface type by its name + # + # The only case should be loopback device with special name (in sysconfig) "lo" + # + # @return [Y2Network::InterfaceType, nil] InterfaceType::LO or nil if not loopback + def type_by_name(iface) + InterfaceType::LO if iface == "lo" + nil + end + end + end + end +end diff --git a/src/lib/y2network/type_detector.rb b/src/lib/y2network/type_detector.rb new file mode 100644 index 000000000..e7b6497ee --- /dev/null +++ b/src/lib/y2network/type_detector.rb @@ -0,0 +1,140 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/interface_type" + +module Y2Network + # Detects type of given interface. New implementation of what was in + # @see Yast::NetworkInterfaces.GetType + class TypeDetector + class << self + # Finds type of given interface + # + # @param iface [String] interface name + # + # @return [Y2Network::InterfaceType, nil] type of given interface or nil if cannot be recognized + def type_of(iface) + type_by_sys(iface) || type_by_config(iface) || nil + end + + private + include Yast::Logger + + SYS_TYPE_NUMBERS = { + "1" => InterfaceType::ETHERNET, + "24" => InterfaceType::ETHERNET, + "32" => InterfaceType::INFINIBAND, + "512" => InterfaceType::PPP, + "768" => InterfaceType::IPIP, + "769" => InterfaceType::IPV6TNL, + "772" => InterfaceType::LO, + "776" => InterfaceType::SIT, + "778" => InterfaceType::GRE, + "783" => InterfaceType::IRDA, + "801" => InterfaceType::WIRELESS, # wlan_aux if needed later + "65534" => InterfaceType::TUN + }.freeze + + # Checks wheter iface type can be recognized by /sys filesystem + # + # @param iface [String] interface name + # @return [Y2Network::InterfaceType, nil] nil when type can be recognized in /sys, + # interface type otherwise + def type_by_sys(iface) + raise ArgumentError, "An interface has to be given." if iface.nil? + + type_dir_path = "/sys/class/net/#{iface}/type" + return nil if !::File.exist?(type_dir_path) + + sys_type = Yast::SCR.Read(Yast::Path.new(".target.string"), type_dir_path).to_s.strip + type = SYS_TYPE_NUMBERS[sys_type] + + # finer detection for some types + type = case type + when InterfaceType::ETHERNET + eth_type_by_sys(iface) + when InterfaceType::INFINIBAND + ib_type_by_sys(iface) + end + + log.info("TypeDetector: #{iface} is of #{type} type according to /sys") + + type + end + + # Detects a subtype of Ethernet device type according /sys or /proc content + # + # @example + # eth_type_by_sys("eth0") -> Ethernet + # eth_type_by_sys("bond0") -> Bonding + # + # @param iface [String] interface name + # @return [Y2Network::InterfaceType] interface type + def eth_type_by_sys(iface) + sys_dir_path = "/sys/class/net/#{iface}" + + if ::File.exist?("#{sys_dir_path}/wireless") + InterfaceType::WIRELESS + elsif ::File.exist?("#{sys_dir_path}/phy80211") + InterfaceType::WIRELESS + elsif ::File.exist?("#{sys_dir_path}/bridge") + InterfaceType::BRIDGE + elsif ::File.exist?("#{sys_dir_path}/bonding") + InterfaceType::BONDING + elsif ::File.exist?("#{sys_dir_path}/tun_flags") + InterfaceType::TUN + elsif ::File.exist?("/proc/net/vlan/#{iface}") + InterfaceType::VLAN + elsif ::File.exist?("/sys/devices/virtual/net/#{iface}") && iface =~ /dummy/ + InterfaceType::DUMMY + else + InterfaceType::ETHERNET + end + end + + # Detects a subtype of InfiniBand device type according /sys + # + # @example + # ib_type_by_sys("ib0") -> Infiniband + # ib_type_by_sys("bond0") -> Bonding + # ib_type_by_sys("ib0.8001") -> Infiniband child + # + # @param iface [String] interface name + # @return [Y2Network::InterfaceType] interface type + def ib_type_by_sys(iface) + sys_dir_path = "/sys/class/net/#{iface}" + + if ::File.exist?("#{sys_dir_path}/bonding") + InterfaceType::BONDING + elsif ::File.exist?("#{sys_dir_path}/create_child") + InterfaceType::INFINIBAND + else + InterfaceType::INFINIBANDCHILD + end + end + + # Checks wheter iface type can be recognized by interface configuration + def type_by_config(iface) + # this part is backend specific + raise NotImplementedError + end + end + end +end From 09bbb4011d438a9c467598803576f84b4412eee1 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Thu, 15 Aug 2019 08:42:42 +0200 Subject: [PATCH 166/471] Converted necessary part of reading iface config from NetworkInterfaces --- src/lib/y2network/sysconfig/type_detector.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/type_detector.rb b/src/lib/y2network/sysconfig/type_detector.rb index 6b4b557ce..fc7bc7921 100644 --- a/src/lib/y2network/sysconfig/type_detector.rb +++ b/src/lib/y2network/sysconfig/type_detector.rb @@ -47,9 +47,19 @@ def type_by_config(iface) type_by_name(iface) end + # Provides interface's sysconfig configuration + # + # @return [Hash{String => Object}] parsed configuration def devmap(iface) - Yast::NetworkInterfaces.Read - Yast::NetworkInterfaces.devmap(iface) + scr_path = ".network.value.\"#{iface}\"" + values = Yast::SCR.Dir(Yast::Path.new(scr_path)) + + # provide configuration in canonicalized format + devmap = Yast::NetworkInterfaces.generate_config(scr_path, values) + + log.info("TypeDetector: #{iface} configuration: #{devmap.inspect}") + + devmap end # Detects interface type according to type specific option From 069c002554941a6265c39ff7fcd0af10aef28510 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Thu, 15 Aug 2019 08:57:16 +0200 Subject: [PATCH 167/471] Use TypeDetector in the interfaces reader --- src/lib/y2network/sysconfig/interfaces_reader.rb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 2be4c3a63..06ca3e285 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -26,9 +26,9 @@ require "y2network/sysconfig/connection_config_reader" require "y2network/interfaces_collection" require "y2network/connection_configs_collection" +require "y2network/sysconfig/type_detector" Yast.import "LanItems" -Yast.import "NetworkInterfaces" module Y2Network module Sysconfig @@ -97,11 +97,6 @@ def find_connections # Instantiates an interface given a hash containing hardware details # - # If there is not information about the type, it will rely on NetworkInterfaces#GetTypeFromSysfs. - # This responsability could be moved to the PhysicalInterface class. - # - # @todo Improve detection logic according to NetworkInterfaces#GetTypeFromIfcfgOrName. - # # @param data [Hash] hardware information # @option data [String] "dev_name" Device name ("eth0") # @option data [String] "name" Device description @@ -109,14 +104,7 @@ def find_connections def build_physical_interface(data) Y2Network::PhysicalInterface.new(data["dev_name"]).tap do |iface| iface.description = data["name"] - type = data["type"] || Yast::NetworkInterfaces.GetTypeFromSysfs(iface.name) - iface.type = case type - when nil then InterfaceType::ETHERNET - when ::String then InterfaceType.from_short_name(type) - when InterfaceType then type - else - raise "Unexpected value in interface type #{type.class.inspect}:#{type.inspect}" - end + iface.type = TypeDetector.type_of(iface.name) end end From c527769286db35b8ebff9bbf89c4d25f254908fb Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Thu, 15 Aug 2019 10:04:22 +0200 Subject: [PATCH 168/471] Adapted testsuite --- test/dns_test.rb | 4 ++++ test/host_test.rb | 4 ++++ test/network_autoconfiguration_test.rb | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/test/dns_test.rb b/test/dns_test.rb index 139ed246c..b8e2405f5 100755 --- a/test/dns_test.rb +++ b/test/dns_test.rb @@ -99,6 +99,10 @@ module Yast let(:stdout) { double } before do + allow(Y2Network::TypeDetector) + .to receive(:type_of) + .with(/eth[0-9]/) + .and_return(Y2Network::InterfaceType::ETHERNET) DNS.dhcp_hostname = true allow(DNS).to receive(:Read) diff --git a/test/host_test.rb b/test/host_test.rb index 3a6cd5a40..50248ed0a 100755 --- a/test/host_test.rb +++ b/test/host_test.rb @@ -33,6 +33,10 @@ before do allow(Yast::Lan).to receive(:yast_config).and_return(lan_config) allow(Yast::SCR).to receive(:Read).with(path(".target.size"), "/etc/hosts").and_return(50) + allow(Y2Network::Sysconfig::TypeDetector) + .to receive(:type_of) + .with(/eth[0-9]/) + .and_return(Y2Network::InterfaceType::ETHERNET) # reset internal caches Yast::Host.instance_variable_set(:"@modified", false) diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 3fa88164d..758938ac9 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -239,6 +239,11 @@ def probe_netcard_factory(num) allow(Yast::LanItems).to receive(:Read) allow(yast_config).to receive(:write) allow(Yast::Lan).to receive(:connected_and_bridgeable?).and_return(true) + # FIXME: seems that autoinst config reader is ... not ready yet + allow(Y2Network::Sysconfig::TypeDetector) + .to receive(:type_of) + .with(/eth[0-9]/) + .and_return(Y2Network::InterfaceType::ETHERNET) Yast::Lan.Import( "devices" => { "eth" => { "eth0" => eth0_profile } }, "routing" => { "routes" => routes_profile } From cdff8730732eaafad94d906856e774b5bdf314c6 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Thu, 15 Aug 2019 10:36:51 +0200 Subject: [PATCH 169/471] Happy rubocop --- src/lib/y2network/connection_configs_collection.rb | 8 -------- src/lib/y2network/sysconfig/type_detector.rb | 7 ++++--- src/lib/y2network/type_detector.rb | 3 ++- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index 716c57a4a..5fa3f55ea 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -53,14 +53,6 @@ def by_name(name) connection_configs.find { |c| c.name == name } end - # Returns a connection configuration tied to the given interface - # - # @param iface [Y2Network::Interface] - # @return [ConnectionConfig, nil] Connection config tied to the interface or nil if not found - def by_interface(iface) - connection_configs.find { |c| c.interface == iface } - end - # Adds or updates a connection configuration # # @note It uses the name to do the matching. diff --git a/src/lib/y2network/sysconfig/type_detector.rb b/src/lib/y2network/sysconfig/type_detector.rb index fc7bc7921..e7ae8104a 100644 --- a/src/lib/y2network/sysconfig/type_detector.rb +++ b/src/lib/y2network/sysconfig/type_detector.rb @@ -30,10 +30,11 @@ module Sysconfig class TypeDetector < Y2Network::TypeDetector class << self private + KEY_TO_TYPE = { - "ETHERDEVICE" => InterfaceType::VLAN, + "ETHERDEVICE" => InterfaceType::VLAN, "WIRELESS_MODE" => InterfaceType::WIRELESS, - "MODEM_DEVICE" => InterfaceType::PPP + "MODEM_DEVICE" => InterfaceType::PPP }.freeze # Checks wheter iface type can be recognized by interface configuration @@ -99,7 +100,7 @@ def type_by_key_value(devmap) # @return [Y2Network::InterfaceType, nil] type according to INTERFACETYPE option # value if recognized, nil otherwise def type_from_interfacetype(devmap) - return InterfaceType::from_short_name(devmap["INTERFACETYPE"]) if devmap["INTERFACETYPE"] + return InterfaceType.from_short_name(devmap["INTERFACETYPE"]) if devmap["INTERFACETYPE"] nil end diff --git a/src/lib/y2network/type_detector.rb b/src/lib/y2network/type_detector.rb index e7b6497ee..8ba55f6a3 100644 --- a/src/lib/y2network/type_detector.rb +++ b/src/lib/y2network/type_detector.rb @@ -35,6 +35,7 @@ def type_of(iface) end private + include Yast::Logger SYS_TYPE_NUMBERS = { @@ -131,7 +132,7 @@ def ib_type_by_sys(iface) end # Checks wheter iface type can be recognized by interface configuration - def type_by_config(iface) + def type_by_config(_iface) # this part is backend specific raise NotImplementedError end From 4b7257069d0cce676cd00eee4c0069d04d57063d Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 15 Aug 2019 14:15:15 +0200 Subject: [PATCH 170/471] add eap mode --- src/lib/y2network/widgets/wireless_auth.rb | 15 +++++--- src/lib/y2network/widgets/wireless_eap.rb | 38 ------------------- .../y2network/widgets/wireless_eap_mode.rb | 21 ++++++++++ 3 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 src/lib/y2network/widgets/wireless_eap.rb diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index ec196ce14..578b287e7 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -1,9 +1,10 @@ require "cwm/custom_widget" require "cwm/replace_point" -require "y2network/widgets/wireless_password" -require "y2network/widgets/wireless_auth_mode" require "y2network/dialogs/wireless_wep_keys" +require "y2network/widgets/wireless_auth_mode" +require "y2network/widgets/wireless_eap" +require "y2network/widgets/wireless_password" module Y2Network module Widgets @@ -46,7 +47,7 @@ def refresh when "no-encryption", "open" then replace_widget.replace(empty_auth_widget) when "sharedkey" then replace_widget.replace(wep_keys_widget) when "wpa-psk" then replace_widget.replace(encryption_widget) - when "wpa-eap" then nil # TODO: write it + when "wpa-eap" then replace_widget.replace(eap_widget) else raise "invalid value #{auth_mode_widget.value.inspect}" end @@ -61,17 +62,21 @@ def empty_auth_widget end def auth_mode_widget - @auth_mode_widget ||= Y2Network::Widgets::WirelessAuthMode.new(settings) + @auth_mode_widget ||= WirelessAuthMode.new(settings) end def encryption_widget - @encryption_widget ||= Y2Network::Widgets::WirelessPassword.new(settings) + @encryption_widget ||= WirelessPassword.new(settings) end def wep_keys_widget @wep_keys_widget ||= WirelessWepKeys.new(settings) end + def eap_widget + @eap_widget ||= WirelessEap.new(settings) + end + class WirelessWepKeys < CWM::PushButton def initialize(settings) @settings = settings diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb deleted file mode 100644 index 0770fe9c0..000000000 --- a/src/lib/y2network/widgets/wireless_eap.rb +++ /dev/null @@ -1,38 +0,0 @@ -require "cwm/common_widgets" - -module Y2Network - module Widgets - class WirelessEapMode < CWM::ComboBox - def initialize(settings) - @settings = settings - end - - def init - self.value = @settings.eap_mode - end - - def label - _("EAP &Mode") - end - - def opt - [:notify] - end - - def items - [ - ["PEAP", _("PEAP")], - ["TLS", _("TLS")], - ["TTLS", _("TTLS")] - ] - end - - def help - "

WPA-EAP uses a RADIUS server to authenticate users. There\n" \ - "are different methods in EAP to connect to the server and\n" \ - "perform the authentication, namely TLS, TTLS, and PEAP.

\n" - end - end - end -end - diff --git a/src/lib/y2network/widgets/wireless_eap_mode.rb b/src/lib/y2network/widgets/wireless_eap_mode.rb index 7ce85d879..0770fe9c0 100644 --- a/src/lib/y2network/widgets/wireless_eap_mode.rb +++ b/src/lib/y2network/widgets/wireless_eap_mode.rb @@ -4,6 +4,27 @@ module Y2Network module Widgets class WirelessEapMode < CWM::ComboBox def initialize(settings) + @settings = settings + end + + def init + self.value = @settings.eap_mode + end + + def label + _("EAP &Mode") + end + + def opt + [:notify] + end + + def items + [ + ["PEAP", _("PEAP")], + ["TLS", _("TLS")], + ["TTLS", _("TTLS")] + ] end def help From e0e31e18c6680b57102d441a89813048680f5e3c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 15 Aug 2019 18:51:28 +0200 Subject: [PATCH 171/471] add initial support for dynamic eap modes --- .../y2network/connection_config/wireless.rb | 8 +- src/lib/y2network/dialogs/wireless_eap.rb | 21 --- .../dialogs/wireless_expert_settings.rb | 2 +- .../interface_config_builders/wireless.rb | 27 +++ .../connection_config_readers/wireless.rb | 2 + .../connection_config_writers/wireless.rb | 2 + src/lib/y2network/sysconfig/interface_file.rb | 8 + src/lib/y2network/widgets/wireless_eap.rb | 162 ++++++++++++++++++ src/lib/y2network/widgets/wireless_essid.rb | 2 +- 9 files changed, 209 insertions(+), 25 deletions(-) delete mode 100644 src/lib/y2network/dialogs/wireless_eap.rb create mode 100644 src/lib/y2network/widgets/wireless_eap.rb diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index be27f49e5..070320197 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -44,7 +44,7 @@ class Wireless < Base # @return [Integer] default WEP key attr_accessor :default_key # @return [String] - attr_accessor :nick + attr_accessor :nick # TODO: what it is? identity? # @return [String] attr_accessor :eap_mode # @return [String] @@ -63,7 +63,11 @@ class Wireless < Base # @return [Integer] (0, 1, 2) attr_accessor :ap_scanmode # @return [String] - attr_accessor :wpa_password + attr_accessor :wpa_password # TODO unify psk and password and write correct one depending on mode + # @return [String] + attr_accessor :wpa_identity + # @return [String] initial identity used for creating tunnel + attr_accessor :wpa_anonymous_identity end end end diff --git a/src/lib/y2network/dialogs/wireless_eap.rb b/src/lib/y2network/dialogs/wireless_eap.rb deleted file mode 100644 index a00540bfe..000000000 --- a/src/lib/y2network/dialogs/wireless_eap.rb +++ /dev/null @@ -1,21 +0,0 @@ -require "yast" -require "cwm/dialog" -require "y2network/widgets/wireless" - -module Y2Network - module Dialogs - class WirelessEap < CWM::Dialog - def initialize(settings) - @settings = settings - - textdomain = "network" - end - - def contents - VBox( - Label("EAP Dialog") - ) - end - end - end -end diff --git a/src/lib/y2network/dialogs/wireless_expert_settings.rb b/src/lib/y2network/dialogs/wireless_expert_settings.rb index 1f26797eb..ac935b045 100644 --- a/src/lib/y2network/dialogs/wireless_expert_settings.rb +++ b/src/lib/y2network/dialogs/wireless_expert_settings.rb @@ -75,7 +75,7 @@ def help "This is generally a good idea, especially if you are a laptop user and may\n" \ "be disconnected from AC power.

\n" ) - end + end private diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index 7ae339400..b0f41e825 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -73,6 +73,33 @@ def wpa_psk=(value) # TODO select backend? @connection_config.wpa_psk = value end + + def wpa_password + @connection_config.wpa_password + end + + def wpa_password=(value) + # TODO select backend? + @connection_config.wpa_password = value + end + + def wpa_identity + @connection_config.wpa_identity + end + + def wpa_identity=(value) + # TODO select backend? + @connection_config.wpa_identity = value + end + + def wpa_anonymous_identity + @connection_config.wpa_anonymous_identity + end + + def wpa_anonymous_identity=(value) + # TODO select backend? + @connection_config.wpa_anonymous_identity = value + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 2c4bbf64f..5340b1898 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -42,6 +42,8 @@ def update_connection_config(conn) conn.nwid = file.wireless_nwid conn.wpa_password = file.wireless_wpa_password conn.wpa_psk = file.wireless_wpa_psk + conn.wpa_identity = file.wireless_wpa_identity + conn.wpa_anonymous_identity = file.wireless_wpa_anonid end # Max number of wireless keys diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb index 592167732..64820035e 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb @@ -59,6 +59,8 @@ def write_auth_settings(conn) def write_eap_auth_settings(conn) file.wireless_eap_mode = conn.eap_mode file.wireless_wpa_password = conn.wpa_password + file.wireless_wpa_identity = conn.wpa_identity + file.wireless_wpa_anonid = conn.wpa_anonymous_identity if conn.eap_mode == "TTLS" end # Writes autentication settings for WPA-PSK networks diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index e36a04911..005002a01 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -210,6 +210,10 @@ def variable_name(param_name) # @return [String] Password as configured on the RADIUS server (for WPA-EAP) define_variable(:wireless_wpa_password) + # @!attribute [r] wireless_wpa_anonid + # @return [String] anonymous identity used for initial tunnel (TTLS) + define_variable(:wireless_wpa_anonid) + # @!attribute [r] wireless_wpa_driver # @return [String] Driver to be used by the wpa_supplicant program define_variable(:wireless_wpa_driver) @@ -218,6 +222,10 @@ def variable_name(param_name) # @return [String] WPA preshared key (for WPA-PSK) define_variable(:wireless_wpa_psk) + # @!attribute [r] wireless_wpa_identity + # @return [String] WPA identify + define_variable(:wireless_wpa_identity) + # @!attribute [r] wireless_eap_mode # @return [String] WPA-EAP outer authentication method define_variable(:wireless_eap_mode) diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb new file mode 100644 index 000000000..a652e1f89 --- /dev/null +++ b/src/lib/y2network/widgets/wireless_eap.rb @@ -0,0 +1,162 @@ +require "cwm/custom_widget" +require "cwm/replace_point" + +require "y2network/widgets/wireless_eap_mode" + +module Y2Network + module Widgets + class WirelessEap < CWM::CustomWidget + attr_reader :settings + + def initialize(settings) + @settings = settings + self.handle_all_events = true + end + + def init + refresh + end + + def handle(event) + return if event["ID"] != eap_mode.widget_id + + refresh + nil + end + + def contents + VBox( + eap_mode, + VSpacing(0.2), + replace_widget, + ) + end + + private + + def eap_mode + @eap_mode ||= WirelessEapMode.new(settings) + end + + def replace_widget + @replace_widget ||= CWM::ReplacePoint.new(id: "wireless_eap_point", widget: CWM::Empty.new("wireless_eap_empty")) + end + + def refresh + case eap_mode.value + when "TTLS" then replace_widget.replace(ttls_widget) + when "PEAP" then replace_widget.replace(peap_widget) + when "TLS" then nil # TODO: write it + else raise "unknown value #{eap_mode.value.inspect}" + end + end + + def ttls_widget + @ttls_widget ||= EapTtls.new(@settings) + end + + def peap_widget + @peap_widget ||= EapPeap.new(@settings) + end + end + + class EapPeap < CWM::CustomWidget + attr_reader :settings + + def initialize(settings) + @settings = settings + end + + def contents + VBox( + HBox(EapUser.new(@settings), EapPassword.new(@settings)) + ) + end + end + + class EapTtls < CWM::CustomWidget + attr_reader :settings + + def initialize(settings) + @settings = settings + end + + def contents + VBox( + HBox(EapUser.new(@settings), EapPassword.new(@settings)), + VSpacing(0.5), + EapAnonymousUser.new(@settings) + ) + end + end + + class EapPassword < CWM::Password + def initialize(builder) + @builder = builder + textdomain "network" + end + + def label + _("Password") + end + + def init + self.value = @builder.wpa_password + end + + def store + @builder.wpa_password = value + end + + def help + "" # TODO: write it + end + end + + class EapUser < CWM::InputField + def initialize(builder) + @builder = builder + textdomain "network" + end + + def label + _("Identity") + end + + def init + self.value = @builder.wpa_identity + end + + def store + @builder.wpa_identity = value + end + + def help + "" # TODO: write it + end + end + + class EapAnonymousUser < CWM::InputField + def initialize(builder) + @builder = builder + textdomain "network" + end + + def label + _("&Anonymous Identity") + end + + def init + self.value = @builder.wpa_anonymous_identity + end + + def store + @builder.wpa_anonymous_identity = value + end + + def help + "" # TODO: write it + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb index 5b98c499e..8abd209fb 100644 --- a/src/lib/y2network/widgets/wireless_essid.rb +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -9,7 +9,7 @@ module Widgets class WirelessEssid < CWM::CustomWidget def initialize(settings) @settings = settings - textdomain = "network" + textdomain "network" end def contents From 3e11e964fc9719e31ea5dca7ccbd202efe33f761 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 19 Aug 2019 11:28:51 +0200 Subject: [PATCH 172/471] add support for server ca path --- .../y2network/connection_config/wireless.rb | 2 + .../interface_config_builders/wireless.rb | 9 +++ .../connection_config_readers/wireless.rb | 1 + .../connection_config_writers/wireless.rb | 1 + src/lib/y2network/sysconfig/interface_file.rb | 4 ++ src/lib/y2network/widgets/path_widget.rb | 58 +++++++++++++++++++ src/lib/y2network/widgets/server_ca_path.rb | 35 +++++++++++ src/lib/y2network/widgets/wireless_eap.rb | 29 +++++++++- 8 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 src/lib/y2network/widgets/path_widget.rb create mode 100644 src/lib/y2network/widgets/server_ca_path.rb diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index 070320197..298825fa3 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -68,6 +68,8 @@ class Wireless < Base attr_accessor :wpa_identity # @return [String] initial identity used for creating tunnel attr_accessor :wpa_anonymous_identity + # @return [String] ca certificate used to sign server certificate + attr_accessor :ca_cert end end end diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index b0f41e825..280663c2a 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -100,6 +100,15 @@ def wpa_anonymous_identity=(value) # TODO select backend? @connection_config.wpa_anonymous_identity = value end + + def ca_cert + @connection_config.ca_cert + end + + def ca_cert=(value) + # TODO select backend? + @connection_config.ca_cert = value + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 5340b1898..88d3e6fbd 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -40,6 +40,7 @@ def update_connection_config(conn) conn.keys = wireless_keys conn.mode = file.wireless_mode conn.nwid = file.wireless_nwid + conn.ca_cert = file.wireless_ca_cert conn.wpa_password = file.wireless_wpa_password conn.wpa_psk = file.wireless_wpa_psk conn.wpa_identity = file.wireless_wpa_identity diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb index 64820035e..ef2aee00b 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb @@ -60,6 +60,7 @@ def write_eap_auth_settings(conn) file.wireless_eap_mode = conn.eap_mode file.wireless_wpa_password = conn.wpa_password file.wireless_wpa_identity = conn.wpa_identity + file.wireless_ca_cert = conn.ca_cert file.wireless_wpa_anonid = conn.wpa_anonymous_identity if conn.eap_mode == "TTLS" end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 005002a01..40b0d90c2 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -226,6 +226,10 @@ def variable_name(param_name) # @return [String] WPA identify define_variable(:wireless_wpa_identity) + # @!attribute [r] wireless_ca_cert + # @return [String] CA certificate used to sign server certificate + define_variable(:wireless_ca_cert) + # @!attribute [r] wireless_eap_mode # @return [String] WPA-EAP outer authentication method define_variable(:wireless_eap_mode) diff --git a/src/lib/y2network/widgets/path_widget.rb b/src/lib/y2network/widgets/path_widget.rb new file mode 100644 index 000000000..4eab21597 --- /dev/null +++ b/src/lib/y2network/widgets/path_widget.rb @@ -0,0 +1,58 @@ +require "abstract_method" + +module Y2Network + module Widgets + # Generic widget for path with browse button + # TODO: add to CWM as generic widget + class PathWidget < CWM::CustomWidget + def initialize + textdomain "network" + end + + abstract_method :label + abstract_method :browse_label + + def contents + HBox( + InputField(Id(text_id), label), + PushButton(Id(button_id), button_label) + ) + end + + def handle + directory = File.dirname(value) + file = ask_method(directory) + self.value = file if file + + nil + end + + def value + Yast::UI.QueryWidget(Id(text_id), :Value) + end + + def value=(path) + Yast::UI.ChangeWidget(Id(text_id), :Value, path) + end + + def text_id + widget_id + "_path" + end + + def button_id + widget_id + "_browse" + end + + def button_label + "..." + end + + # UI method responsible for asking for file/directory. By default uses + # Yast::UI.AskForExistingFile with "*" filter. Redefine if different popup is needed or + # specific filter required. + def ask_method(directory) + Yast::UI.AskForExistingFile(directory, "*", browse_label) + end + end + end +end diff --git a/src/lib/y2network/widgets/server_ca_path.rb b/src/lib/y2network/widgets/server_ca_path.rb new file mode 100644 index 000000000..1adcaf53f --- /dev/null +++ b/src/lib/y2network/widgets/server_ca_path.rb @@ -0,0 +1,35 @@ +require "y2network/widgets/path_widget" + +module Y2Network + module Widgets + class ServerCAPath < PathWidget + def initialize(builder) + textdomain "network" + @builder = builder + end + + # FIXME: label and help text is wrong, here it is certificate of CA that is used to sign server certificate + def label + _("&Server Certificate") + end + + def help + "

To increase security, it is recommended to configure\n" \ + "a Server Certificate. It is used\n" \ + "to validate the server's authenticity.

\n" + end + + def browse_label + _("Choose a Certificate") + end + + def init + self.value = @builder.ca_cert + end + + def store + @builder.ca_cert = value + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb index a652e1f89..bbdd9071d 100644 --- a/src/lib/y2network/widgets/wireless_eap.rb +++ b/src/lib/y2network/widgets/wireless_eap.rb @@ -2,6 +2,7 @@ require "cwm/replace_point" require "y2network/widgets/wireless_eap_mode" +require "y2network/widgets/server_ca_path" module Y2Network module Widgets @@ -46,7 +47,7 @@ def refresh case eap_mode.value when "TTLS" then replace_widget.replace(ttls_widget) when "PEAP" then replace_widget.replace(peap_widget) - when "TLS" then nil # TODO: write it + when "TLS" then replace_widget.replace(tls_widget) else raise "unknown value #{eap_mode.value.inspect}" end end @@ -58,6 +59,10 @@ def ttls_widget def peap_widget @peap_widget ||= EapPeap.new(@settings) end + + def tls_widget + @tls_widget ||= EapTls.new(@settings) + end end class EapPeap < CWM::CustomWidget @@ -69,7 +74,9 @@ def initialize(settings) def contents VBox( - HBox(EapUser.new(@settings), EapPassword.new(@settings)) + HBox(EapUser.new(@settings), EapPassword.new(@settings)), + VSpacing(0.5), + ServerCAPath.new(@settings) ) end end @@ -85,7 +92,23 @@ def contents VBox( HBox(EapUser.new(@settings), EapPassword.new(@settings)), VSpacing(0.5), - EapAnonymousUser.new(@settings) + EapAnonymousUser.new(@settings), + VSpacing(0.5), + ServerCAPath.new(@settings) + ) + end + end + + class EapTls < CWM::CustomWidget + attr_reader :settings + + def initialize(settings) + @settings = settings + end + + def contents + VBox( + ServerCAPath.new(@settings) ) end end From a7337b606bee99cd61c7d626e5251ce79debd584 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Mon, 19 Aug 2019 12:14:03 +0200 Subject: [PATCH 173/471] Renamed INFINIBANDCHILD -> INFINIBAND_CHILD --- src/lib/y2network/interface_type.rb | 2 +- src/lib/y2network/type_detector.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_type.rb b/src/lib/y2network/interface_type.rb index 0e92813fd..30e82e03b 100644 --- a/src/lib/y2network/interface_type.rb +++ b/src/lib/y2network/interface_type.rb @@ -112,7 +112,7 @@ def method_missing(method_name, *arguments, &block) # Infiniband card INFINIBAND = new(N_("Infiniband"), "ib") # Infiniband card child device. Used in IPoIB (IP-over-InfiniBand) - INFINIBANDCHILD = new(N_("Infiniband Child"), "ibchild") + INFINIBAND_CHILD = new(N_("Infiniband Child"), "ibchild") # Bonding device BONDING = new(N_("Bonding"), "bond") # bridge device diff --git a/src/lib/y2network/type_detector.rb b/src/lib/y2network/type_detector.rb index 8ba55f6a3..4d408ccec 100644 --- a/src/lib/y2network/type_detector.rb +++ b/src/lib/y2network/type_detector.rb @@ -127,7 +127,7 @@ def ib_type_by_sys(iface) elsif ::File.exist?("#{sys_dir_path}/create_child") InterfaceType::INFINIBAND else - InterfaceType::INFINIBANDCHILD + InterfaceType::INFINIBAND_CHILD end end From d507d1765c7cf1bf161866de5fe27850bb949c96 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Mon, 19 Aug 2019 15:29:30 +0200 Subject: [PATCH 174/471] Refactoring in type detector / interface file --- src/lib/y2network/sysconfig/interface_file.rb | 78 +++++++++++++---- src/lib/y2network/sysconfig/type_detector.rb | 84 +------------------ 2 files changed, 64 insertions(+), 98 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index e36a04911..cb5bad335 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -260,6 +260,10 @@ def variable_name(param_name) ## BONDING + # @!attribute [r] bonding_master + # @return [String] whether the interface is a bond device or not + define_variable(:bonding_master) + # @!attribute [r] bonding_slaves # @return [Hash] Bonding slaves define_collection_variable(:bonding_slave) @@ -344,11 +348,15 @@ def save # Determines the interface's type # - # @todo Borrow logic from https://github.com/yast/yast-yast2/blob/6f7a789d00cd03adf62e00da34720f326f0e0633/library/network/src/modules/NetworkInterfaces.rb#L291 - # - # @return [Y2Network::InterfaceType] Interface's type depending on the file values + # @return [Y2Network::InterfaceType] Interface's type depending on the configuration + # If particular type cannot be recognized, then + # ETHERNET is returned (same default as in wicked) def type - type_from_keys || type_from_values || InterfaceType::ETHERNET + type_by_key_value || + type_by_key_existence || + type_from_interfacetype || + type_by_name || + InterfaceType::ETHERNET end # Empties all known values @@ -364,25 +372,59 @@ def clean private - # Determines the Interface type based on specific values + # Detects interface type according to type specific option and its value # - # @return [Y2Network::InterfaceType, nil] - def type_from_values - return InterfaceType::DUMMY if interfacetype == "dummy" + # @return [Y2Network::InterfaceType, nil] particular type if recognized, nil otherwise + def type_by_key_value + return InterfaceType::BONDING if bonding_master == "yes" return InterfaceType::BRIDGE if bridge == "yes" - # TODO: Add support for ip-tunnels - return InterfaceType::TUN if tunnel == "tun" - return InterfaceType::TAP if tunnel == "tap" + return InterfaceType.from_short_name(tunnel) if tunnel + + # in relation to original implementation ommited ENCAP option which leads to isdn + # and PPPMODE which leads to ppp. Neither of this type has been handled as + # "netcard" - see Yast::NetworkInterfaces for details + + nil + end + + KEY_TO_TYPE = { + "ETHERDEVICE" => InterfaceType::VLAN, + "WIRELESS_MODE" => InterfaceType::WIRELESS, + "MODEM_DEVICE" => InterfaceType::PPP + }.freeze + + # Detects interface type according to type specific option + # + # @return [Y2Network::InterfaceType, nil] particular type if recognized, nil otherwise + def type_by_key_existence + key = KEY_TO_TYPE.keys.find { |k| defined_variables.include?(k) } + return KEY_TO_TYPE[key] if key + + nil end - # Determines the Interface type based on defined variables + # Detects interface type according to sysconfig's INTERFACETYPE option + # + # This option is kind of special that it deserve own method mostly for documenting + # that it should almost never be used. Only meaningful cases for its usage is + # dummy device definition and loopback device (when an additional to standard ifcfg-lo + # is defined) + # + # @return [Y2Network::InterfaceType, nil] type according to INTERFACETYPE option + # value if recognized, nil otherwise + def type_from_interfacetype + return InterfaceType.from_short_name(interfacetype) if interfacetype + nil + end + + # Distinguishes interface type by its name + # + # The only case should be loopback device with special name (in sysconfig) "lo" # - # @return [Y2Network::InterfaceType, nil] - def type_from_keys - return InterfaceType::BONDING if defined_variables.any? { |k| k.start_with?("BOND") } - return InterfaceType::WIRELESS if defined_variables.any? { |k| k.start_with?("WIRELESS") } - return InterfaceType::VLAN if defined_variables.include? "ETHERDEVICE" - return InterfaceType::INFINIBAND if defined_variables.include? "IPOIB_MODE" + # @return [Y2Network::InterfaceType, nil] InterfaceType::LO or nil if not loopback + def type_by_name + InterfaceType::LO if interface == "lo" + nil end # Returns a list of those keys that have a value diff --git a/src/lib/y2network/sysconfig/type_detector.rb b/src/lib/y2network/sysconfig/type_detector.rb index e7ae8104a..c9ee8614a 100644 --- a/src/lib/y2network/sysconfig/type_detector.rb +++ b/src/lib/y2network/sysconfig/type_detector.rb @@ -20,8 +20,7 @@ require "yast" require "y2network/interface_type" require "y2network/type_detector" - -Yast.import "NetworkInterfaces" +require "y2network/sysconfig/interface_file" module Y2Network module Sysconfig @@ -31,87 +30,12 @@ class TypeDetector < Y2Network::TypeDetector class << self private - KEY_TO_TYPE = { - "ETHERDEVICE" => InterfaceType::VLAN, - "WIRELESS_MODE" => InterfaceType::WIRELESS, - "MODEM_DEVICE" => InterfaceType::PPP - }.freeze # Checks wheter iface type can be recognized by interface configuration def type_by_config(iface) - devmap = devmap(iface) - return nil if !devmap - - type_by_key_value(devmap) || - type_by_key_existence(devmap) || - type_from_interfacetype(devmap) || - type_by_name(iface) - end - - # Provides interface's sysconfig configuration - # - # @return [Hash{String => Object}] parsed configuration - def devmap(iface) - scr_path = ".network.value.\"#{iface}\"" - values = Yast::SCR.Dir(Yast::Path.new(scr_path)) - - # provide configuration in canonicalized format - devmap = Yast::NetworkInterfaces.generate_config(scr_path, values) - - log.info("TypeDetector: #{iface} configuration: #{devmap.inspect}") - - devmap - end - - # Detects interface type according to type specific option - # - # @param devmap [Hash] a sysconfig configuration of an interface - # - # @return [Y2Network::InterfaceType, nil] particular type if recognized, nil otherwise - def type_by_key_existence(devmap) - key = KEY_TO_TYPE.keys.find { |k| devmap.include?(k) } - return KEY_TO_TYPE[key] if key - - nil - end - - # Detects interface type according to type specific option and its value - # - # @param devmap [Hash] a sysconfig configuration of an interface - # - # @return [Y2Network::InterfaceType, nil] particular type if recognized, nil otherwise - def type_by_key_value(devmap) - return InterfaceType::BONDING if devmap["BONDING_MASTER"] == "yes" - return InterfaceType::BRIDGE if devmap["BRIDGE"] == "yes" - return InterfaceType::WIRELESS if devmap["WIRELESS"] == "yes" - return InterfaceType.from_short_name(devmap["TUNNEL"]) if devmap["TUNNEL"] - - # in relation to original implementation ommited ENCAP option which leads to isdn - # and PPPMODE which leads to ppp. Neither of this type has been handled as - # "netcard" - see Yast::NetworkInterfaces for details - - nil - end - - # Detects interface type according to sysconfig's INTERFACETYPE option - # - # @param devmap [Hash] a sysconfig configuration of an interface - # - # @return [Y2Network::InterfaceType, nil] type according to INTERFACETYPE option - # value if recognized, nil otherwise - def type_from_interfacetype(devmap) - return InterfaceType.from_short_name(devmap["INTERFACETYPE"]) if devmap["INTERFACETYPE"] - nil - end - - # Distinguishes interface type by its name - # - # The only case should be loopback device with special name (in sysconfig) "lo" - # - # @return [Y2Network::InterfaceType, nil] InterfaceType::LO or nil if not loopback - def type_by_name(iface) - InterfaceType::LO if iface == "lo" - nil + iface_file = Y2Network::Sysconfig::InterfaceFile.find(iface) + iface_file.load + iface_file.type end end end From 51b1c545dbb328e42b840ab8892449e80bba0699 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 19 Aug 2019 16:35:46 +0200 Subject: [PATCH 175/471] add client key and client cert path widgets --- .../y2network/connection_config/wireless.rb | 4 ++ .../interface_config_builders/wireless.rb | 18 +++++++++ .../connection_config_readers/wireless.rb | 2 + .../connection_config_writers/wireless.rb | 2 + src/lib/y2network/sysconfig/interface_file.rb | 8 ++++ src/lib/y2network/widgets/client_cert_path.rb | 39 +++++++++++++++++++ src/lib/y2network/widgets/client_key_path.rb | 32 +++++++++++++++ src/lib/y2network/widgets/wireless_eap.rb | 9 +++-- 8 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 src/lib/y2network/widgets/client_cert_path.rb create mode 100644 src/lib/y2network/widgets/client_key_path.rb diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index 298825fa3..8f7583b2d 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -70,6 +70,10 @@ class Wireless < Base attr_accessor :wpa_anonymous_identity # @return [String] ca certificate used to sign server certificate attr_accessor :ca_cert + # @return [String] client certificate used to login for TLS + attr_accessor :client_cert + # @return [String] client private key used to encrypt for TLS + attr_accessor :client_key end end end diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index 280663c2a..e06a59b21 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -109,6 +109,24 @@ def ca_cert=(value) # TODO select backend? @connection_config.ca_cert = value end + + def client_cert + @connection_config.client_cert + end + + def client_cert=(value) + # TODO select backend? + @connection_config.client_cert = value + end + + def client_key + @connection_config.client_key + end + + def client_key=(value) + # TODO select backend? + @connection_config.client_key = value + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index 88d3e6fbd..aa340bcfe 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -41,6 +41,8 @@ def update_connection_config(conn) conn.mode = file.wireless_mode conn.nwid = file.wireless_nwid conn.ca_cert = file.wireless_ca_cert + conn.client_cert = file.wireless_client_cert + conn.client_key = file.wireless_client_key conn.wpa_password = file.wireless_wpa_password conn.wpa_psk = file.wireless_wpa_psk conn.wpa_identity = file.wireless_wpa_identity diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb index ef2aee00b..cd3252428 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb @@ -62,6 +62,8 @@ def write_eap_auth_settings(conn) file.wireless_wpa_identity = conn.wpa_identity file.wireless_ca_cert = conn.ca_cert file.wireless_wpa_anonid = conn.wpa_anonymous_identity if conn.eap_mode == "TTLS" + file.wireless_client_cert = conn.client_cert if conn.eap_mode == "TLS" + file.wireless_client_key = conn.client_key if conn.eap_mode == "TLS" end # Writes autentication settings for WPA-PSK networks diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 40b0d90c2..70620189b 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -230,6 +230,14 @@ def variable_name(param_name) # @return [String] CA certificate used to sign server certificate define_variable(:wireless_ca_cert) + # @!attribute [r] wireless_client_cert + # @return [String] CA certificate used to sign server certificate + define_variable(:wireless_client_cert) + + # @!attribute [r] wireless_client_key + # @return [String] client private key used for encryption in TLS + define_variable(:wireless_client_key) + # @!attribute [r] wireless_eap_mode # @return [String] WPA-EAP outer authentication method define_variable(:wireless_eap_mode) diff --git a/src/lib/y2network/widgets/client_cert_path.rb b/src/lib/y2network/widgets/client_cert_path.rb new file mode 100644 index 000000000..6543b67cd --- /dev/null +++ b/src/lib/y2network/widgets/client_cert_path.rb @@ -0,0 +1,39 @@ +require "y2network/widgets/path_widget" + +module Y2Network + module Widgets + class ClientCertPath < PathWidget + def initialize(builder) + textdomain "network" + @builder = builder + end + + # FIXME: label and help text is wrong, here it is certificate of CA that is used to sign server certificate + def label + _("&Client Certificate") + end + + def help + _( + "

TLS uses a Client Certificate instead of a username and\n" \ + "password combination for authentication. It uses a public and private key pair\n" \ + "to encrypt negotiation communication, therefore you will additionally need\n" \ + "a Client Key file that contains your private key and\n" \ + "the appropriate Client Key Password for that file.

\n" + ) + end + + def browse_label + _("Choose a Certificate") + end + + def init + self.value = @builder.client_cert + end + + def store + @builder.client_cert = value + end + end + end +end diff --git a/src/lib/y2network/widgets/client_key_path.rb b/src/lib/y2network/widgets/client_key_path.rb new file mode 100644 index 000000000..c3eaca3d3 --- /dev/null +++ b/src/lib/y2network/widgets/client_key_path.rb @@ -0,0 +1,32 @@ +require "y2network/widgets/path_widget" + +module Y2Network + module Widgets + class ClientKeyPath < PathWidget + def initialize(builder) + textdomain "network" + @builder = builder + end + + def label + _("Client &Key") + end + + def help + "" # TODO: was missing, write something + end + + def browse_label + _("Choose a File with Private Key") + end + + def init + self.value = @builder.client_key + end + + def store + @builder.client_key = value + end + end + end +end diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb index bbdd9071d..6c57d49c9 100644 --- a/src/lib/y2network/widgets/wireless_eap.rb +++ b/src/lib/y2network/widgets/wireless_eap.rb @@ -3,6 +3,8 @@ require "y2network/widgets/wireless_eap_mode" require "y2network/widgets/server_ca_path" +require "y2network/widgets/client_cert_path" +require "y2network/widgets/client_key_path" module Y2Network module Widgets @@ -75,7 +77,6 @@ def initialize(settings) def contents VBox( HBox(EapUser.new(@settings), EapPassword.new(@settings)), - VSpacing(0.5), ServerCAPath.new(@settings) ) end @@ -91,9 +92,7 @@ def initialize(settings) def contents VBox( HBox(EapUser.new(@settings), EapPassword.new(@settings)), - VSpacing(0.5), EapAnonymousUser.new(@settings), - VSpacing(0.5), ServerCAPath.new(@settings) ) end @@ -108,6 +107,10 @@ def initialize(settings) def contents VBox( + HBox( + ClientCertPath.new(@settings), + ClientKeyPath.new(@settings) + ), ServerCAPath.new(@settings) ) end From fc95d5968b875945a72d11f788022fc7eff6b35d Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 20 Aug 2019 10:48:37 +0200 Subject: [PATCH 176/471] fix rubocop and add tests for some widgets --- src/include/network/lan/wizards.rb | 28 +++---- .../y2network/dialogs/wireless_wep_keys.rb | 4 +- .../interface_config_builders/wireless.rb | 14 ++-- .../y2network/widgets/wireless_auth_mode.rb | 2 +- src/lib/y2network/widgets/wireless_eap.rb | 12 ++- .../y2network/widgets/wireless_eap_mode.rb | 16 +++- src/lib/y2network/widgets/wireless_essid.rb | 4 +- src/lib/y2network/widgets/wireless_expert.rb | 6 +- src/lib/y2network/widgets/wireless_tab.rb | 1 - .../widgets/wireless_eap_mode_test.rb | 31 ++++++++ test/y2network/widgets/wireless_eap_test.rb | 73 +++++++++++++++++++ 11 files changed, 155 insertions(+), 36 deletions(-) create mode 100644 test/y2network/widgets/wireless_eap_mode_test.rb create mode 100644 test/y2network/widgets/wireless_eap_test.rb diff --git a/src/include/network/lan/wizards.rb b/src/include/network/lan/wizards.rb index fa70fefc3..1ee3c48ed 100644 --- a/src/include/network/lan/wizards.rb +++ b/src/include/network/lan/wizards.rb @@ -175,26 +175,26 @@ def NetworkCardSequence(action, builder:) Sequencer.Run(aliases, sequence) end - def AddressSequence(which, builder:) + def AddressSequence(_which, builder:) # TODO: add builder wherever needed aliases = { - "address" => -> { AddressDialog(builder: builder) }, - "hosts" => -> { HostsMainDialog(false) }, - "s390" => -> { S390Dialog(builder: builder) }, - "commit" => [-> { Commit(builder: builder) }, true] + "address" => -> { AddressDialog(builder: builder) }, + "hosts" => -> { HostsMainDialog(false) }, + "s390" => -> { S390Dialog(builder: builder) }, + "commit" => [-> { Commit(builder: builder) }, true] } sequence = { - "ws_start" => "address", - "address" => { - abort: :abort, - next: "commit", - hosts: "hosts", - s390: "s390", + "ws_start" => "address", + "address" => { + abort: :abort, + next: "commit", + hosts: "hosts", + s390: "s390" }, - "s390" => { abort: :abort, next: "address" }, - "hosts" => { abort: :abort, next: "address" }, - "commit" => { next: :next } + "s390" => { abort: :abort, next: "address" }, + "hosts" => { abort: :abort, next: "address" }, + "commit" => { next: :next } } Sequencer.Run(aliases, sequence) diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index 7b6af1daa..8cc7524ae 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -42,7 +42,7 @@ def contents VBox( VSpacing(1), # ComboBox label - Left(ComboBox(Id(:length), _("&Key Length"), [64,128])), + Left(ComboBox(Id(:length), _("&Key Length"), [64, 128])), VSpacing(1), Table( Id(:table), @@ -55,7 +55,7 @@ def contents _("Key"), # Table header label Center(_("Default")) - ), + ) ), HBox( # PushButton label diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index e06a59b21..d74b9c6a0 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -70,7 +70,7 @@ def wpa_psk end def wpa_psk=(value) - # TODO select backend? + # TODO: select backend? @connection_config.wpa_psk = value end @@ -79,7 +79,7 @@ def wpa_password end def wpa_password=(value) - # TODO select backend? + # TODO: select backend? @connection_config.wpa_password = value end @@ -88,7 +88,7 @@ def wpa_identity end def wpa_identity=(value) - # TODO select backend? + # TODO: select backend? @connection_config.wpa_identity = value end @@ -97,7 +97,7 @@ def wpa_anonymous_identity end def wpa_anonymous_identity=(value) - # TODO select backend? + # TODO: select backend? @connection_config.wpa_anonymous_identity = value end @@ -106,7 +106,7 @@ def ca_cert end def ca_cert=(value) - # TODO select backend? + # TODO: select backend? @connection_config.ca_cert = value end @@ -115,7 +115,7 @@ def client_cert end def client_cert=(value) - # TODO select backend? + # TODO: select backend? @connection_config.client_cert = value end @@ -124,7 +124,7 @@ def client_key end def client_key=(value) - # TODO select backend? + # TODO: select backend? @connection_config.client_key = value end end diff --git a/src/lib/y2network/widgets/wireless_auth_mode.rb b/src/lib/y2network/widgets/wireless_auth_mode.rb index 5840fc4e4..5de56ccb0 100644 --- a/src/lib/y2network/widgets/wireless_auth_mode.rb +++ b/src/lib/y2network/widgets/wireless_auth_mode.rb @@ -37,7 +37,7 @@ def help end def store - @settings.auth_mode = self.value + @settings.auth_mode = value end end end diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb index 6c57d49c9..260908454 100644 --- a/src/lib/y2network/widgets/wireless_eap.rb +++ b/src/lib/y2network/widgets/wireless_eap.rb @@ -8,6 +8,8 @@ module Y2Network module Widgets + # High Level widget that allow to select kind of EAP authentication and also dynamically change + # its content according to selection class WirelessEap < CWM::CustomWidget attr_reader :settings @@ -31,7 +33,7 @@ def contents VBox( eap_mode, VSpacing(0.2), - replace_widget, + replace_widget ) end @@ -67,6 +69,7 @@ def tls_widget end end + # High level widget that represent PEAP authentication class EapPeap < CWM::CustomWidget attr_reader :settings @@ -82,6 +85,7 @@ def contents end end + # High level widget that represent TTLS authentication class EapTtls < CWM::CustomWidget attr_reader :settings @@ -98,6 +102,7 @@ def contents end end + # High level widget that represent TLS authentication class EapTls < CWM::CustomWidget attr_reader :settings @@ -116,6 +121,7 @@ def contents end end + # Widget that represent EAP password class EapPassword < CWM::Password def initialize(builder) @builder = builder @@ -139,6 +145,7 @@ def help end end + # Widget that represent EAP user class EapUser < CWM::InputField def initialize(builder) @builder = builder @@ -162,6 +169,7 @@ def help end end + # Widget that represent EAP anonymous user that is used for initial connection class EapAnonymousUser < CWM::InputField def initialize(builder) @builder = builder @@ -169,7 +177,7 @@ def initialize(builder) end def label - _("&Anonymous Identity") + _("&Anonymous Identity") end def init diff --git a/src/lib/y2network/widgets/wireless_eap_mode.rb b/src/lib/y2network/widgets/wireless_eap_mode.rb index 0770fe9c0..4802846be 100644 --- a/src/lib/y2network/widgets/wireless_eap_mode.rb +++ b/src/lib/y2network/widgets/wireless_eap_mode.rb @@ -2,6 +2,7 @@ module Y2Network module Widgets + # Widget to select EAP mode. class WirelessEapMode < CWM::ComboBox def initialize(settings) @settings = settings @@ -11,10 +12,16 @@ def init self.value = @settings.eap_mode end + def store + @settings.eap_mode = value + end + def label _("EAP &Mode") end + # generate event when changed so higher level widget can change content + # @see Y2Network::Widgets::WirelessEap def opt [:notify] end @@ -28,11 +35,12 @@ def items end def help - "

WPA-EAP uses a RADIUS server to authenticate users. There\n" \ - "are different methods in EAP to connect to the server and\n" \ - "perform the authentication, namely TLS, TTLS, and PEAP.

\n" + _( + "

WPA-EAP uses a RADIUS server to authenticate users. There\n" \ + "are different methods in EAP to connect to the server and\n" \ + "perform the authentication, namely TLS, TTLS, and PEAP.

\n" + ) end end end end - diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb index 8abd209fb..861c03106 100644 --- a/src/lib/y2network/widgets/wireless_essid.rb +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -51,7 +51,7 @@ def opt def update_essid_list(networks) old_value = value - change_items(networks.map {|n| [n, n]}) + change_items(networks.map { |n| [n, n] }) self.value = old_value end @@ -75,7 +75,7 @@ def label def handle networks = essid_list - Yast2::Feedback.show("Obtaining essid list", headline: "Scanning network") do |f| + Yast2::Feedback.show("Obtaining essid list", headline: "Scanning network") do |_f| networks = essid_list log.info("Found networks: #{networks}") end diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index 76e849c8c..b531b05c4 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -14,7 +14,7 @@ def init end def label - _("&Channel") + _("&Channel") end def opt @@ -48,11 +48,11 @@ def items private def bitrates - [54,48,36,24,18,12,11,9,6,5.5,2,1] + [54, 48, 36, 24, 18, 12, 11, 9, 6, 5.5, 2, 1] end end - class WirelessAccessPoint< CWM::InputField + class WirelessAccessPoint < CWM::InputField def initialize(settings) @settings = settings end diff --git a/src/lib/y2network/widgets/wireless_tab.rb b/src/lib/y2network/widgets/wireless_tab.rb index 6c6bddd22..f069a5ae3 100644 --- a/src/lib/y2network/widgets/wireless_tab.rb +++ b/src/lib/y2network/widgets/wireless_tab.rb @@ -32,4 +32,3 @@ def contents end end end - diff --git a/test/y2network/widgets/wireless_eap_mode_test.rb b/test/y2network/widgets/wireless_eap_mode_test.rb new file mode 100644 index 000000000..e87b5cfed --- /dev/null +++ b/test/y2network/widgets/wireless_eap_mode_test.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/wireless_eap" +require "y2network/interface_config_builder" + +describe Y2Network::Widgets::WirelessEapMode do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::ComboBox" +end diff --git a/test/y2network/widgets/wireless_eap_test.rb b/test/y2network/widgets/wireless_eap_test.rb new file mode 100644 index 000000000..116a3d0f6 --- /dev/null +++ b/test/y2network/widgets/wireless_eap_test.rb @@ -0,0 +1,73 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/wireless_eap" +require "y2network/interface_config_builder" + +describe Y2Network::Widgets::WirelessEap do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" +end + +describe Y2Network::Widgets::EapPeap do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" +end + +describe Y2Network::Widgets::EapTls do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" +end + +describe Y2Network::Widgets::EapTtls do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" +end + +describe Y2Network::Widgets::EapPassword do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::Password" +end + +describe Y2Network::Widgets::EapUser do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" +end + +describe Y2Network::Widgets::EapAnonymousUser do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" +end From 7a39a6c4d59981365078a7af45ef3123e0282146 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 20 Aug 2019 11:42:19 +0200 Subject: [PATCH 177/471] add missing textdomain --- src/lib/y2network/dialogs/wireless_wep_keys.rb | 4 ++-- src/lib/y2network/widgets/wireless.rb | 1 + src/lib/y2network/widgets/wireless_auth_mode.rb | 1 + src/lib/y2network/widgets/wireless_eap_mode.rb | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index 8cc7524ae..592862a89 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -4,6 +4,7 @@ module Y2Network module Dialogs class WirelessWepKeys < CWM::Dialog def initialize(settings) + textdomain "network" @settings = settings end @@ -19,14 +20,13 @@ def help "The other keys can be used to decrypt data. Usually you have only\n" \ "one key.

" ) + - # Wireless keys dialog help 2/3 _( "

Key Length defines the bit length of your WEP keys.\n" \ "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" \ "Some older hardware might not be able to handle 128 bit keys, so if your\n" \ "wireless LAN connection does not establish, you may need to set this\n" \ "value to 64.

" - ) + "" + ) end def contents diff --git a/src/lib/y2network/widgets/wireless.rb b/src/lib/y2network/widgets/wireless.rb index 7db705e9f..81b513ba8 100644 --- a/src/lib/y2network/widgets/wireless.rb +++ b/src/lib/y2network/widgets/wireless.rb @@ -8,6 +8,7 @@ class Wireless < CWM::CustomWidget attr_reader :settings def initialize(settings) + textdomain "network" @settings = settings end diff --git a/src/lib/y2network/widgets/wireless_auth_mode.rb b/src/lib/y2network/widgets/wireless_auth_mode.rb index 5de56ccb0..6e14e86eb 100644 --- a/src/lib/y2network/widgets/wireless_auth_mode.rb +++ b/src/lib/y2network/widgets/wireless_auth_mode.rb @@ -8,6 +8,7 @@ def initialize(settings) end def init + textdomain "network" self.value = @settings.auth_mode end diff --git a/src/lib/y2network/widgets/wireless_eap_mode.rb b/src/lib/y2network/widgets/wireless_eap_mode.rb index 4802846be..f83798606 100644 --- a/src/lib/y2network/widgets/wireless_eap_mode.rb +++ b/src/lib/y2network/widgets/wireless_eap_mode.rb @@ -5,6 +5,7 @@ module Widgets # Widget to select EAP mode. class WirelessEapMode < CWM::ComboBox def initialize(settings) + textdomain "network" @settings = settings end From 1ea6e49d9a37ec35c1edf600f73e05828a3c082d Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 20 Aug 2019 14:57:27 +0200 Subject: [PATCH 178/471] improve documentation and lower minimal level due to many cwm widgets --- Rakefile | 2 +- .../dialogs/wireless_expert_settings.rb | 1 + src/lib/y2network/dialogs/wireless_wep_keys.rb | 2 ++ src/lib/y2network/widgets/wireless.rb | 2 ++ src/lib/y2network/widgets/wireless_auth.rb | 4 ++++ src/lib/y2network/widgets/wireless_eap_mode.rb | 1 + src/lib/y2network/widgets/wireless_essid.rb | 16 ++++++++++++++++ src/lib/y2network/widgets/wireless_expert.rb | 13 +++++++++++++ src/lib/y2network/widgets/wireless_mode.rb | 13 ++++++++++++- src/lib/y2network/widgets/wireless_password.rb | 2 ++ src/lib/y2network/widgets/wireless_tab.rb | 2 ++ 11 files changed, 56 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index f901faccb..f7c02bac4 100644 --- a/Rakefile +++ b/Rakefile @@ -4,5 +4,5 @@ Yast::Tasks.configuration do |conf| # lets ignore license check for now conf.skip_license_check << /.*/ # ensure we are not getting worse with documentation - conf.documentation_minimal = 62 if conf.respond_to?(:documentation_minimal=) + conf.documentation_minimal = 61 if conf.respond_to?(:documentation_minimal=) end diff --git a/src/lib/y2network/dialogs/wireless_expert_settings.rb b/src/lib/y2network/dialogs/wireless_expert_settings.rb index ac935b045..2cfa79785 100644 --- a/src/lib/y2network/dialogs/wireless_expert_settings.rb +++ b/src/lib/y2network/dialogs/wireless_expert_settings.rb @@ -5,6 +5,7 @@ module Y2Network module Dialogs + # Dialog that shows when expert button is clicked on wireless tab. class WirelessExpertSettings < CWM::Dialog # @param settings [InterfaceBuilder] object holding interface configuration # modified by the dialog. diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index 592862a89..3b50293e4 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -2,7 +2,9 @@ module Y2Network module Dialogs + # Dialog to manage WEP keys class WirelessWepKeys < CWM::Dialog + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings diff --git a/src/lib/y2network/widgets/wireless.rb b/src/lib/y2network/widgets/wireless.rb index 81b513ba8..9253b4b00 100644 --- a/src/lib/y2network/widgets/wireless.rb +++ b/src/lib/y2network/widgets/wireless.rb @@ -4,9 +4,11 @@ module Y2Network module Widgets + # Top level widget for frame with general wireless settings class Wireless < CWM::CustomWidget attr_reader :settings + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index 578b287e7..604d19a5b 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -8,9 +8,12 @@ module Y2Network module Widgets + # Top level widget for wireless authentication. It changes content dynamically depending + # on selected authentication method. class WirelessAuth < CWM::CustomWidget attr_reader :settings + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings self.handle_all_events = true @@ -77,6 +80,7 @@ def eap_widget @eap_widget ||= WirelessEap.new(settings) end + # Button for showing WEP Keys dialog class WirelessWepKeys < CWM::PushButton def initialize(settings) @settings = settings diff --git a/src/lib/y2network/widgets/wireless_eap_mode.rb b/src/lib/y2network/widgets/wireless_eap_mode.rb index f83798606..4705fde75 100644 --- a/src/lib/y2network/widgets/wireless_eap_mode.rb +++ b/src/lib/y2network/widgets/wireless_eap_mode.rb @@ -4,6 +4,7 @@ module Y2Network module Widgets # Widget to select EAP mode. class WirelessEapMode < CWM::ComboBox + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb index 861c03106..0b90704e8 100644 --- a/src/lib/y2network/widgets/wireless_essid.rb +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -6,7 +6,9 @@ module Y2Network module Widgets + # Widget to setup wifi network essid class WirelessEssid < CWM::CustomWidget + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings textdomain "network" @@ -22,6 +24,8 @@ def contents ) end + private + def essid @essid ||= WirelessEssidName.new(@settings) end @@ -31,9 +35,12 @@ def scan end end + # Widget for network name combobox class WirelessEssidName < CWM::ComboBox + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings + textdomain "network" end def label @@ -45,10 +52,13 @@ def init Yast::UI.ChangeWidget(Id(widget_id), :ValidChars, valid_chars) end + # allow to use not found name e.g. when scan failed or when network is hidden def opt [:editable] end + # updates essid list with given array and ensure that previously selected value is preserved + # @param networks [Array] def update_essid_list(networks) old_value = value change_items(networks.map { |n| [n, n] }) @@ -62,10 +72,14 @@ def valid_chars end end + # Button for scan network sites class WirelessScan < CWM::PushButton + # @param settings [Y2network::InterfaceConfigBuilder] + # @param update [WirelessEssidName] def initialize(settings, update:) @settings = settings @update_widget = update + textdomain "network" end def label @@ -85,6 +99,8 @@ def handle nil end + private + def obtained_networks(networks) output = "
    " networks.map { |n| output << "
  • #{n}
    • " } diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index b531b05c4..96080f825 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -2,7 +2,9 @@ module Y2Network module Widgets + # Channel selector widget class WirelessChannel < CWM::ComboBox + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings @@ -26,7 +28,9 @@ def items end end + # bit rate selection widget class WirelessBitRate < CWM::ComboBox + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings @@ -52,9 +56,12 @@ def bitrates end end + # Widget to select access point if site consist of multiple ones class WirelessAccessPoint < CWM::InputField + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings + textdomain "network" end def opt @@ -70,9 +77,12 @@ def init end end + # Widget that enables wifi power management class WirelessPowerManagement < CWM::CheckBox + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings + textdomain "network" end def label @@ -84,9 +94,12 @@ def init end end + # widget to set Scan mode class WirelessAPScanMode < CWM::IntField + # @param settings [Y2network::InterfaceConfigBuilder] def initialize(settings) @settings = settings + textdomain "network" end def opt diff --git a/src/lib/y2network/widgets/wireless_mode.rb b/src/lib/y2network/widgets/wireless_mode.rb index b8ebf13d9..79fbc2109 100644 --- a/src/lib/y2network/widgets/wireless_mode.rb +++ b/src/lib/y2network/widgets/wireless_mode.rb @@ -2,7 +2,9 @@ module Y2Network module Widgets + # Widget to select mode in which wifi card operate class WirelessMode < CWM::ComboBox + # @param config [Y2network::InterfaceConfigBuilder] def initialize(config) @config = config textdomain "network" @@ -16,12 +18,21 @@ def init self.value = @config.mode end + # notify when mode change as it affect other elements def opt [:notify, :hstretch] end + def store + @config.mode = value + end + def items - ["Add-hoc", "Managed", "Master"].map { |m| [m, m] } + [ + ["ad-hoc", _("Ad-hoc")], + ["managed", _("Managed")], + ["master", _("Master")] + ] end end end diff --git a/src/lib/y2network/widgets/wireless_password.rb b/src/lib/y2network/widgets/wireless_password.rb index 063b661ad..a4777ae91 100644 --- a/src/lib/y2network/widgets/wireless_password.rb +++ b/src/lib/y2network/widgets/wireless_password.rb @@ -2,7 +2,9 @@ module Y2Network module Widgets + # Widget for WPA "home" password. It is not used for EAP password. class WirelessPassword < CWM::Password + # @param builder [Y2network::InterfaceConfigBuilder] def initialize(builder) textdomain "network" @builder = builder diff --git a/src/lib/y2network/widgets/wireless_tab.rb b/src/lib/y2network/widgets/wireless_tab.rb index f069a5ae3..26c6c8395 100644 --- a/src/lib/y2network/widgets/wireless_tab.rb +++ b/src/lib/y2network/widgets/wireless_tab.rb @@ -7,7 +7,9 @@ module Y2Network module Widgets + # Tab for wireless specific stuff. Useful only for wireless cards class WirelessTab < CWM::Tab + # @param builder [Y2network::InterfaceConfigBuilder] def initialize(builder) textdomain "network" From 72af6cec210dd5b510746cf8fc223bb501152495 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 20 Aug 2019 15:01:53 +0200 Subject: [PATCH 179/471] add missing textdomain --- src/lib/y2network/widgets/wireless_auth.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index 604d19a5b..c8b6dc1e1 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -17,6 +17,7 @@ class WirelessAuth < CWM::CustomWidget def initialize(settings) @settings = settings self.handle_all_events = true + textdomain "network" end def init From 3b4ba98db94f5bda5be5b2c26e4255917d2a26c2 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 20 Aug 2019 16:30:33 +0200 Subject: [PATCH 180/471] implement properly channel and bitrate widgets and backend --- .../y2network/connection_config/wireless.rb | 4 +- .../interface_config_builders/wireless.rb | 81 +++++-------------- .../connection_config_readers/wireless.rb | 2 + .../connection_config_writers/wireless.rb | 2 + src/lib/y2network/sysconfig/interface_file.rb | 16 +++- src/lib/y2network/widgets/wireless_expert.rb | 23 +++++- 6 files changed, 58 insertions(+), 70 deletions(-) diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index 8f7583b2d..34b186d86 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -49,11 +49,11 @@ class Wireless < Base attr_accessor :eap_mode # @return [String] attr_accessor :eap_auth - # @return [Integer] + # @return [Integer, nil] attr_accessor :channel # @return [Integer] attr_accessor :frequency - # @return [Integer] + # @return [Float, nil] bitrate limitation in Mb/s or nil for automatic attr_accessor :bitrate # @return [String] attr_accessor :ap diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index d74b9c6a0..78dc211cb 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -1,10 +1,13 @@ require "yast" +require "forwardable" require "y2network/config" require "y2network/interface_config_builder" module Y2Network module InterfaceConfigBuilders + # Builder for wireless configuration. Many methods delegated to ConnectionConfig::Wireless class Wireless < InterfaceConfigBuilder + extend Forwardable include Yast::Logger def initialize(config: nil) @@ -30,6 +33,11 @@ def essid ) end + def essid=(value) + @config["WIRELESS_ESSID"] = value + @connection_config.essid = value + end + def auth_modes Yast::LanItems.wl_auth_modes end @@ -65,68 +73,17 @@ def access_point ) end - def wpa_psk - @connection_config.wpa_psk - end - - def wpa_psk=(value) - # TODO: select backend? - @connection_config.wpa_psk = value - end - - def wpa_password - @connection_config.wpa_password - end - - def wpa_password=(value) - # TODO: select backend? - @connection_config.wpa_password = value - end - - def wpa_identity - @connection_config.wpa_identity - end - - def wpa_identity=(value) - # TODO: select backend? - @connection_config.wpa_identity = value - end - - def wpa_anonymous_identity - @connection_config.wpa_anonymous_identity - end - - def wpa_anonymous_identity=(value) - # TODO: select backend? - @connection_config.wpa_anonymous_identity = value - end - - def ca_cert - @connection_config.ca_cert - end - - def ca_cert=(value) - # TODO: select backend? - @connection_config.ca_cert = value - end - - def client_cert - @connection_config.client_cert - end - - def client_cert=(value) - # TODO: select backend? - @connection_config.client_cert = value - end - - def client_key - @connection_config.client_key - end - - def client_key=(value) - # TODO: select backend? - @connection_config.client_key = value - end + # TODO: select backend? probably not needed as we will merge it when new backend will be already ready + def_delegators :@connection_config, + :wpa_psk, :wpa_psk=, + :wpa_password, :wpa_password=, + :wpa_identity, :wpa_identity=, + :wpa_anonymous_identity, :wpa_anonymous_identity=, + :ca_cert, :ca_cert=, + :client_key, :client_key=, + :client_cert, :client_cert=, + :channel, :channel=, + :bitrate, :bitrate= end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb index aa340bcfe..c4017592c 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb @@ -47,6 +47,8 @@ def update_connection_config(conn) conn.wpa_psk = file.wireless_wpa_psk conn.wpa_identity = file.wireless_wpa_identity conn.wpa_anonymous_identity = file.wireless_wpa_anonid + conn.channel = file.wireless_channel + conn.bitrate = file.wireless_rate end # Max number of wireless keys diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb index cd3252428..bd7a77938 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb @@ -34,6 +34,8 @@ def update_file(conn) file.wireless_essid = conn.essid file.wireless_mode = conn.mode file.wireless_nwid = conn.nwid + file.wireless_channel = conn.channel + file.wireless_rate = conn.bitrate write_auth_settings(conn) if conn.auth_mode end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 70620189b..7c01817d3 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -255,13 +255,17 @@ def variable_name(param_name) define_variable(:wireless_ap) # @!attribute [r] wireless_channel - # @return [Integer] Wireless channel - define_variable(:wireless_channel) + # @return [Integer, nil] Wireless channel or nil for auto selection + define_variable(:wireless_channel, :integer) # @!attribute [r] wireless_nwid # @return [String] Network ID define_variable(:wireless_nwid) + # @!attribute [r] wireless_rate + # @return [String] Wireless bit rate specification ( Mb/s) + define_variable(:wireless_rate, :float) + ## INFINIBAND # @!attribute [r] ipoib_mode @@ -470,6 +474,14 @@ def value_as_integer(value) value.nil? || value.empty? ? nil : value.to_i end + # Converts the value into an float (or nil if empty) + # + # @param [String] value + # @return [Float,nil] + def value_as_float(value) + value.nil? || value.empty? ? nil : value.to_f + end + # Converts the value into a symbol (or nil if empty) # # @param [String] value diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index 96080f825..6a0fc77a1 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -12,7 +12,11 @@ def initialize(settings) end def init - disable + self.value = @settings.channel + end + + def store + @settings.channel = value end def label @@ -24,7 +28,8 @@ def opt end def items - 1.upto(14).map { |c| [c.to_s, c.to_s] }.prepend(["", _("Automatic")]) + # FIXME: different protocol has different number of channels, we need to reflect it somehow + 1.upto(14).map { |c| [c, c.to_s] }.prepend([nil, _("Automatic")]) end end @@ -38,17 +43,27 @@ def initialize(settings) end def opt - [:hstretch] + [:hstretch, :editable] end def label _("B&it Rate") end + def init + self.value = @settings.bitrate + end + + def store + @settings.bitrate = value + end + def items - bitrates.map { |b| [b.to_s, b.to_s] }.prepend(["", _("Automatic")]) + bitrates.map { |b| [b.to_f, b.to_s] }.prepend([nil, _("Automatic")]) end + # TODO: help text with units (Mb/s) + private def bitrates From 6658f26a2efde12c7b4e93aa4127a6619a8cb5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 14 Aug 2019 09:51:07 +0100 Subject: [PATCH 181/471] Add simple classes to represent a udev rule --- src/lib/y2network/udev_rule.rb | 125 ++++++++++++++++++++++++++ src/lib/y2network/udev_rule_part.rb | 81 +++++++++++++++++ test/y2network/udev_rule_part_test.rb | 78 ++++++++++++++++ test/y2network/udev_rule_test.rb | 107 ++++++++++++++++++++++ 4 files changed, 391 insertions(+) create mode 100644 src/lib/y2network/udev_rule.rb create mode 100644 src/lib/y2network/udev_rule_part.rb create mode 100644 test/y2network/udev_rule_part_test.rb create mode 100644 test/y2network/udev_rule_test.rb diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb new file mode 100644 index 000000000..e509e3b8b --- /dev/null +++ b/src/lib/y2network/udev_rule.rb @@ -0,0 +1,125 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/udev_rule_part" + +module Y2Network + # Simple udev rule class + # + # This class represents a network udev rule. The current implementation is quite simplistic, + # featuring a pretty simple API. + # + # @example Create a rule containing some key/value pairs (rule part) + # rule = Y2Network::UdevRule.new( + # Y2Network::UdevRulePart.new("ATTR{address}", "==", "?*31:78:f2"), + # Y2Network::UdevRulePart.new("NAME", "=", "mlx4_ib3") + # ) + # rule.to_s #=> "ACTION==\"add\", SUBSYSTEM==\"net\", ATTR{address}==\"?*31:78:f2\", NAME=\"eth0\"" + # + # @example Create a rule from a string + # rule = UdevRule.find_for("eth0") + # rule.to_s #=> "ACTION==\"add\", SUBSYSTEM==\"net\", ATTR{address}==\"?*31:78:f2\", NAME=\"eth0\"" + class UdevRule + class << self + # Returns the udev rule for a given device + # + # @param device [String] Network device name + # @return [UdevRule] udev rule + def find_for(device) + rules_map = Yast::SCR.Read(Yast::Path.new(".udev_persistent.net")) || {} + return nil unless rules_map.key?(device) + parts = rules_map[device].map { |p| UdevRulePart.from_string(p) } + new(parts) + end + + # Helper method to create a rename rule based on a MAC address + # + # @param name [String] Interface's name + # @param mac [String] MAC address + def new_mac_based_rename(name, mac) + new_network_rule([ + UdevRulePart.new("ATTR{address}", "=", mac), + UdevRulePart.new("NAME", "=", name) + ]) + end + + # Helper method to create a rename rule based on the BUS ID + # + # @param name [String] Interface's name + # @param mac [String] BUS ID (e.g., "0000:08:00.0") + # @param dev_port [String] Device port + def new_bus_id_based_rename(name, bus_id, dev_port = nil) + parts = [UdevRulePart.new("KERNELS", "=", bus_id)] + parts.push(UdevRulePart.new("ATTR{dev_port}", "=", dev_port)) if dev_port + parts.push(UdevRulePart.new("NAME", "=", name)) + new_network_rule(parts) + end + + # Returns a network rule + # + # The network rule includes some parts by default. + # + # @param parts [Array] List of udev rules + def write(udev_rules) + Yast::SCR.Write(Yast::Path.new(".udev_persistent.rules"), udev_rules.map(&:to_s)) + Yast::SCR.Write(Yast::Path.new(".udev_persistent.nil"), []) + end + end + + # @return [Array] Parts of the udev rule + attr_reader :parts + + # Constructor + # + # @param [Array] udev rule parts + def initialize(parts = []) + @parts = parts + end + + # Adds a part to the rule + # + # @param key [String] Key name + # @param operator [String] Operator + # @param value [String] Value to match or assign + def add_part(key, operator, value) + @parts << UdevRulePart.new(key, operator, value) + end + + # Returns an string representation that can be used in a rules file + # + # @return [String] + def to_s + parts.map(&:to_s).join(", ") + end + end +end diff --git a/src/lib/y2network/udev_rule_part.rb b/src/lib/y2network/udev_rule_part.rb new file mode 100644 index 000000000..1306dba84 --- /dev/null +++ b/src/lib/y2network/udev_rule_part.rb @@ -0,0 +1,81 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +module Y2Network + # Simple class to represent a key-value pair in a udev rule + # + # This class does not check whether operators or keys/values are valid or not. We can implement + # that logic later if required. + class UdevRulePart + # Regular expression to match a udev rule part + PART_REGEXP = Regexp.new("\\A(?[A-Za-z\{\}]+)(?[^\"]+)\"(?.+)\"\\Z") + + class << self + # Returns a rule part from a string + # + # @example Simple case + # part = UdevRulePart.from_string('ACTION=="add"') + # part.key #=> "ACTION" + # part.operator #=> "==" + # part.value #=> "add" + # + # @param str [String] string form of an udev rule + # @return [UdevRule] udev rule object + def from_string(str) + match = PART_REGEXP.match(str) + return if match.nil? + new(match[:key], match[:operator], match[:value]) + end + end + # @return [String] Key name + attr_accessor :key + # @return [String] Operator ("==", "!=", "=", "+=", "-=", ":=") + attr_accessor :operator + # @return [String] Value to match or assign + attr_accessor :value + + # Constructor + # + # @param key [String] Key name + # @param operator [String] Operator ("==", "!=", "=", "+=", "-=", ":=") + # @param value [String] Value to match or assign + def initialize(key, operator, value) + @key = key + @operator = operator + @value = value + end + + # Determines whether two udev rule parts are equivalent + # + # @param other [UdevRulePart] The rule part to compare with + # @return [Boolean] + def ==(other) + key == other.key && operator == other.operator && value == other.value + end + + alias_method :eql?, :== + + # Returns an string representation of the udev rule part + # + # @return [String] + def to_s + "#{key}#{operator}\"#{value}\"" + end + end +end diff --git a/test/y2network/udev_rule_part_test.rb b/test/y2network/udev_rule_part_test.rb new file mode 100644 index 000000000..5a581aa99 --- /dev/null +++ b/test/y2network/udev_rule_part_test.rb @@ -0,0 +1,78 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" +require "y2network/udev_rule_part" + +describe Y2Network::UdevRulePart do + subject(:part) { described_class.new(key, operator, value) } + + let(:key) { "ACTION" } + let(:operator) { "==" } + let(:value) { "add" } + + describe ".from_string" do + it "returns an udev rule part extracting the elements from the string" do + part = described_class.from_string("ACTION==\"add\"") + expect(part.key).to eq("ACTION") + expect(part.operator).to eq("==") + expect(part.value).to eq("add") + end + end + + describe "#to_s" do + it "returns an string representation compatible with rules files format" do + expect(part.to_s).to eq('ACTION=="add"') + end + end + + describe "#==" do + let(:other) { described_class.new("ACTION", "==", "add") } + + context "when key, operator and value are the same" do + it "returns true" do + expect(part).to eq(other) + end + end + + context "when the key differs" do + let(:key) { "ENV{var1}" } + + it "returns false" do + expect(part).to_not eq(other) + end + end + + context "when the operator differs" do + let(:operator) { "!=" } + + it "returns false" do + expect(part).to_not eq(other) + end + end + + context "when the value differs" do + let(:value) { "remove" } + + it "returns false" do + expect(part).to_not eq(other) + end + end + end +end diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb new file mode 100644 index 000000000..e6147f210 --- /dev/null +++ b/test/y2network/udev_rule_test.rb @@ -0,0 +1,107 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" +require "y2network/udev_rule" + +describe Y2Network::UdevRule do + subject(:udev_rule) { described_class.new(parts) } + + let(:parts) { [] } + + let(:udev_persistent) do + { + "eth0" => ["SUBSYSTEM==\"net\"", "ACTION==\"add\"", "ATTR{address}==\"?*31:78:f2\"", "NAME=\"eth0\""] + } + end + + before do + allow(Yast::SCR).to receive(:Read).with(Yast::Path.new(".udev_persistent.net")) + .and_return(udev_persistent) + end + + describe ".find_for" do + it "returns the udev rule for the given device" do + rule = described_class.find_for("eth0") + expect(rule.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", ATTR{address}==\"?*31:78:f2\", NAME=\"eth0\"" + ) + end + + context "when there is no udev rule for the given device" do + it "returns nil" do + expect(described_class.find_for("eth1")).to be_nil + end + end + end + + describe ".new_mac_based_rename" do + it "returns a MAC based renaming rule" do + rule = described_class.new_mac_based_rename("eth0", "01:23:45:67:89:ab") + expect(rule.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{type}==\"1\", " \ + "ATTR{address}=\"01:23:45:67:89:ab\", NAME=\"eth0\"" + ) + end + end + + describe ".new_bus_id_based_rename" do + it "returns a BUS ID based renaming rule" do + rule = described_class.new_bus_id_based_rename("eth0", "0000:08:00.0", "1") + expect(rule.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{type}==\"1\", " \ + "KERNELS=\"0000:08:00.0\", ATTR{dev_port}=\"1\", NAME=\"eth0\"" + ) + end + + context "when the dev_port is not defined" do + it "does not include the dev_port part" do + rule = described_class.new_bus_id_based_rename("eth0", "0000:08:00.0") + expect(rule.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{type}==\"1\", " \ + "KERNELS=\"0000:08:00.0\", NAME=\"eth0\"" + ) + end + end + end + + describe "#add_part" do + it "adds a new key/value to the rule" do + udev_rule.add_part("ACTION", "==", "add") + expect(udev_rule.parts).to eq([ + Y2Network::UdevRulePart.new("ACTION", "==", "add") + ]) + end + end + + describe "#to_s" do + let(:parts) do + [ + Y2Network::UdevRulePart.new("ACTION", "==", "add"), + Y2Network::UdevRulePart.new("NAME", "=", "dummy") + ] + end + + it "returns the string representation for the rules file" do + expect(udev_rule.to_s).to eq( + 'ACTION=="add", NAME="dummy"' + ) + end + end +end From 37e13e4723b48a877dac5c571378f0aa36aac351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 19 Aug 2019 11:41:36 +0100 Subject: [PATCH 182/471] Reads interfaces renaming mechanisms --- src/lib/y2network/interface.rb | 2 ++ src/lib/y2network/sysconfig/interfaces_reader.rb | 16 ++++++++++++++++ .../sysconfig/interfaces_reader_test.rb | 14 ++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 6301284ca..3e06a0704 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -45,6 +45,8 @@ class Interface attr_reader :configured # @return [HwInfo] attr_reader :hardware + # @return [Symbol] Mechanism to rename the interface (nil -no rename-, :bus_id or :mac) + attr_accessor :renaming_mechanism # Shortcuts for accessing interfaces' ifcfg options # diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 2be4c3a63..859ed3a79 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -26,6 +26,7 @@ require "y2network/sysconfig/connection_config_reader" require "y2network/interfaces_collection" require "y2network/connection_configs_collection" +require "y2network/udev_rule" Yast.import "LanItems" Yast.import "NetworkInterfaces" @@ -110,6 +111,7 @@ def build_physical_interface(data) Y2Network::PhysicalInterface.new(data["dev_name"]).tap do |iface| iface.description = data["name"] type = data["type"] || Yast::NetworkInterfaces.GetTypeFromSysfs(iface.name) + iface.renaming_mechanism = renaming_mechanism_for(iface.name) iface.type = case type when nil then InterfaceType::ETHERNET when ::String then InterfaceType.from_short_name(type) @@ -144,6 +146,20 @@ def add_interface(name, conn) interface_class = conn.virtual? ? VirtualInterface : FakeInterface @interfaces << interface_class.from_connection(name, conn) end + + # Detects the renaming mechanism used by the interface + # + # @param name [String] Interface's name + # @return [Symbol,nil] :mac (MAC address), :bus_id (BUS ID) or nil (no renaming) + def renaming_mechanism_for(name) + rule = UdevRule.find_for(name) + return nil unless rule + if rule.parts.any? { |p| p.key == "ATTR{address}" } + :mac + elsif rule.parts.any? { |p| p.key == "KERNELS" } + :bus_id + end + end end end end diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index 1184f6158..7c3b4e0b7 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -19,6 +19,7 @@ require_relative "../../test_helper" require "y2network/sysconfig/interfaces_reader" +require "y2network/udev_rule_part" describe Y2Network::Sysconfig::InterfacesReader do subject(:reader) { described_class.new } @@ -33,6 +34,13 @@ } end + let(:udev_rule) do + Y2Network::UdevRule.new([ + Y2Network::UdevRulePart.new("ATTR{address}", "==", "00:12:34:56:78"), + Y2Network::UdevRulePart.new("ACTION", "=", "eth0") + ]) + end + let(:configured_interfaces) { ["lo", "eth0"] } TYPES = { "eth0" => "eth" }.freeze @@ -42,6 +50,7 @@ .and_return(configured_interfaces) allow(Yast::SCR).to receive(:Dir).and_call_original allow(Yast::NetworkInterfaces).to receive(:GetTypeFromSysfs) { |n| TYPES[n] } + allow(Y2Network::UdevRule).to receive(:find_for).and_return(udev_rule) end around { |e| change_scr_root(File.join(DATA_PATH, "scr_read"), &e) } @@ -52,6 +61,11 @@ expect(interfaces.by_name("eth0")).to_not be_nil end + it "sets the renaming mechanism" do + eth0 = reader.interfaces.by_name("eth0") + expect(eth0.renaming_mechanism).to eq(:mac) + end + it "reads wifi interfaces" it "reads bridge interfaces" it "reads bonding interfaces" From 2ed6dec27e327b67cecf432ca9031c0fca628868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 20 Aug 2019 16:04:57 +0100 Subject: [PATCH 183/471] Add support for dev_port to Hwinfo class --- src/lib/y2network/hwinfo.rb | 12 ++++++++++-- test/y2network/hwinfo_test.rb | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index dff3a9da2..68d8674ae 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -76,7 +76,8 @@ def initialize(name:) { name: "wl_auth_modes", default: "" }, { name: "wl_enc_modes", default: nil }, { name: "wl_channels", default: nil }, - { name: "wl_bitrates", default: nil } + { name: "wl_bitrates", default: nil }, + { name: "dev_port", default: nil } ].each do |hwinfo_item| define_method hwinfo_item[:name].downcase do @hwinfo ? @hwinfo.fetch(hwinfo_item[:name], hwinfo_item[:default]) : hwinfo_item[:default] @@ -117,7 +118,14 @@ def drivers include Yast::I18n def load_hwinfo(name) - Yast::LanItems.Hardware.find { |h| h["dev_name"] == name } + hw = Yast::LanItems.Hardware.find { |h| h["dev_name"] == name } + return nil if hw.nil? + + raw_dev_port = Yast::SCR.Read( + Yast::Path.new(".target.string"), "/sys/class_net/#{name}/dev_port" + ).to_s.strip + hw["dev_port"] = raw_dev_port unless raw_dev_port.empty? + hw end end end diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 985c2d4d9..1cc6084f8 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -56,4 +56,30 @@ ) end end + + describe "#dev_port" do + let(:interface_name) { "enp1s0" } + + before do + allow(Yast::SCR).to receive(:Read) + .with(Yast::Path.new(".target.string"), "/sys/class_net/#{interface_name}/dev_port") + .and_return(raw_dev_port) + end + + context "when the dev_port is defined" do + let(:raw_dev_port) { "0000:08:00.0" } + + it "returns the dev_port" do + expect(hwinfo.dev_port).to eq("0000:08:00.0") + end + end + + context "when the dev_port is not defined" do + let(:raw_dev_port) { "\n" } + + it "returns the dev_port" do + expect(hwinfo.dev_port).to be_nil + end + end + end end From 4bb234c7d6492456824f66219a02c30ff2685223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 20 Aug 2019 13:10:26 +0100 Subject: [PATCH 184/471] Write udev rules --- src/lib/y2network/sysconfig/config_writer.rb | 11 +++ .../y2network/sysconfig/interfaces_writer.rb | 64 +++++++++++++ .../y2network/sysconfig/config_writer_test.rb | 11 ++- .../sysconfig/interfaces_writer_test.rb | 89 +++++++++++++++++++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 src/lib/y2network/sysconfig/interfaces_writer.rb create mode 100644 test/y2network/sysconfig/interfaces_writer_test.rb diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 451cfcb14..2dd789f77 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -22,6 +22,7 @@ require "y2network/sysconfig/routes_file" require "y2network/sysconfig/dns_writer" require "y2network/sysconfig/connection_config_writer" +require "y2network/sysconfig/interfaces_writer" module Y2Network module Sysconfig @@ -46,6 +47,7 @@ def write(config, old_config = nil) file.save write_dns_settings(config, old_config) + write_interfaces(config.interfaces) write_connections(config.connections) end @@ -168,6 +170,15 @@ def write_dns_settings(config, old_config) writer.write(config.dns, old_dns) end + # Updates the interfaces configuration + # + # @param interfaces [Y2Network::InterfacesCollection] + # @see Y2Network::Sysconfig::InterfacesWriter + def write_interfaces(interfaces) + writer = Y2Network::Sysconfig::InterfacesWriter.new + writer.write(interfaces) + end + # Writes connections configuration # # @todo Handle old connections (removing those that are needed, etc.) diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb new file mode 100644 index 000000000..ccf5d84d5 --- /dev/null +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -0,0 +1,64 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/udev_rule" +require "yast2/execute" + +module Y2Network + module Sysconfig + # This class writes interfaces specific configuration + # + # Although it might be confusing, this class is only responsible for writing + # hardware specific configuration through udev rules. + # + # @see Y2Network::InterfacesCollection + class InterfacesWriter + # Writes interfaces hardware configuration and refreshes udev + # + # @param interfaces [Y2Network::InterfacesCollection] Interfaces collection + def write(interfaces) + udev_rules = interfaces.map { |i| udev_rule_for(i) }.compact + Y2Network::UdevRule.write(udev_rules) + update_udevd + end + + private + + # Creates an udev rule for the given interface + # + # @param iface [Interface] Interface to generate the udev rule for + # @return [UdevRule,nil] udev rule or nil if it is not needed + def udev_rule_for(iface) + case iface.renaming_mechanism + when :mac + Y2Network::UdevRule.new_mac_based_rename(iface.name, iface.hardware.mac) + when :bus_id + Y2Network::UdevRule.new_bus_id_based_rename(iface.name, iface.hardware.busid, iface.hardware.dev_port) + end + end + + # Refreshes udev service + def update_udevd + Yast::Execute.on_target!("/usr/bin/udevadm", "control", "--reload") + Yast::Execute.on_target!("/usr/bin/udevadm", "trigger", "--subsystem-match=net", "--action=add") + end + end + end +end diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 9226df92e..4f4ebff86 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -20,6 +20,7 @@ require "y2network/sysconfig/config_writer" require "y2network/config" require "y2network/interface" +require "y2network/interfaces_collection" require "y2network/routing" require "y2network/route" require "y2network/routing_table" @@ -33,7 +34,7 @@ describe "#write" do let(:config) do Y2Network::Config.new( - interfaces: [eth0], + interfaces: Y2Network::InterfacesCollection.new([eth0]), connections: [eth0_conn], routing: routing, source: :sysconfig @@ -83,6 +84,7 @@ let(:dns_writer) { instance_double(Y2Network::Sysconfig::DNSWriter, write: nil) } let(:conn_writer) { instance_double(Y2Network::Sysconfig::ConnectionConfigWriter, write: nil) } + let(:interfaces_writer) { instance_double(Y2Network::Sysconfig::InterfacesWriter, write: nil) } before do allow(Y2Network::Sysconfig::RoutesFile).to receive(:new) @@ -95,6 +97,8 @@ .and_return(dns_writer) allow(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:new) .and_return(conn_writer) + allow(Y2Network::Sysconfig::InterfacesWriter).to receive(:new) + .and_return(interfaces_writer) allow(eth0).to receive(:configured).and_return(true) end @@ -198,5 +202,10 @@ expect(conn_writer).to receive(:write).with(eth0_conn) writer.write(config, old_config) end + + it "writes interfaces configurations" do + expect(interfaces_writer).to receive(:write).with(config.interfaces) + writer.write(config) + end end end diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb new file mode 100644 index 000000000..d1fabfd2d --- /dev/null +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -0,0 +1,89 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/sysconfig/interfaces_writer" +require "y2network/udev_rule" +require "y2network/physical_interface" +require "y2network/interfaces_collection" + +describe Y2Network::Sysconfig::InterfacesWriter do + subject(:writer) { described_class.new } + + describe "#write" do + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } + let(:eth0) do + Y2Network::PhysicalInterface.new("eth0").tap { |i| i.renaming_mechanism = renaming_mechanism } + end + let(:hardware) do + instance_double(Y2Network::Hwinfo, busid: "00:1c.0", mac: "01:23:45:67:89:ab", dev_port: "1") + end + let(:renaming_mechanism) { nil } + + before do + allow(Yast::Execute).to receive(:on_target!) + allow(eth0).to receive(:hardware).and_return(hardware) + end + + context "when the interface is renamed using the MAC" do + let(:renaming_mechanism) { :mac } + + it "writes a MAC based udev renaming rule" do + expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(rules.first.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ + "ATTR{type}==\"1\", ATTR{address}=\"01:23:45:67:89:ab\", NAME=\"eth0\"" + ) + end + subject.write(interfaces) + end + end + + context "when the interface is renamed using the BUS ID" do + let(:renaming_mechanism) { :bus_id } + + it "writes a BUS ID based udev renaming rule" do + expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(rules.first.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ + "ATTR{type}==\"1\", KERNELS=\"00:1c.0\", ATTR{dev_port}=\"1\", NAME=\"eth0\"" + ) + end + subject.write(interfaces) + end + end + + context "when the interface is not renamed" do + let(:renaming_mechanism) { nil } + + it "does not write a udev rule" do + expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(rules).to be_empty + end + subject.write(interfaces) + end + end + + it "refreshes udev" do + expect(Yast::Execute).to receive(:on_target!).with("/usr/bin/udevadm", "control", any_args) + expect(Yast::Execute).to receive(:on_target!).with("/usr/bin/udevadm", "trigger", any_args) + subject.write(interfaces) + end + end +end From c586a3a97f5b1d0caa1dd6d1300cef0b0411e525 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 20 Aug 2019 22:31:16 +0200 Subject: [PATCH 185/471] Add test for wireless expert widgets --- src/lib/y2network/widgets/wireless_expert.rb | 12 ++-- .../y2network/widgets/wireless_expert_test.rb | 59 +++++++++++++++++++ 2 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 test/y2network/widgets/wireless_expert_test.rb diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index 6a0fc77a1..e46bff4a1 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -12,11 +12,11 @@ def initialize(settings) end def init - self.value = @settings.channel + self.value = @settings.channel.to_s end def store - @settings.channel = value + @settings.channel = value.empty? ? nil : value.to_i end def label @@ -29,7 +29,7 @@ def opt def items # FIXME: different protocol has different number of channels, we need to reflect it somehow - 1.upto(14).map { |c| [c, c.to_s] }.prepend([nil, _("Automatic")]) + 1.upto(14).map { |c| [c.to_s, c.to_s] }.prepend(["", _("Automatic")]) end end @@ -51,15 +51,15 @@ def label end def init - self.value = @settings.bitrate + self.value = @settings.bitrate.to_s end def store - @settings.bitrate = value + @settings.bitrate = value.empty? ? nil : value.to_f end def items - bitrates.map { |b| [b.to_f, b.to_s] }.prepend([nil, _("Automatic")]) + bitrates.map { |b| [b.to_s, b.to_s] }.prepend(["", _("Automatic")]) end # TODO: help text with units (Mb/s) diff --git a/test/y2network/widgets/wireless_expert_test.rb b/test/y2network/widgets/wireless_expert_test.rb new file mode 100644 index 000000000..9a13bd28a --- /dev/null +++ b/test/y2network/widgets/wireless_expert_test.rb @@ -0,0 +1,59 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/wireless_expert" +require "y2network/interface_config_builder" + +describe Y2Network::Widgets::WirelessChannel do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::ComboBox" +end + +describe Y2Network::Widgets::WirelessBitRate do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::ComboBox" +end + +describe Y2Network::Widgets::WirelessAccessPoint do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" +end + +describe Y2Network::Widgets::WirelessPowerManagement do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CheckBox" +end + +describe Y2Network::Widgets::WirelessAPScanMode do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::IntField" +end From 68ba3c49682493a383b596abd40852daa4ac01b7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 09:35:24 +0200 Subject: [PATCH 186/471] remove power management widget which cannot be configured using ifcfg --- .../y2network/connection_config/wireless.rb | 2 -- .../dialogs/wireless_expert_settings.rb | 2 -- .../interface_config_builders/wireless.rb | 8 +++++- src/lib/y2network/widgets/wireless_expert.rb | 27 +++++++++---------- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index 34b186d86..b51896aa8 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -57,8 +57,6 @@ class Wireless < Base attr_accessor :bitrate # @return [String] attr_accessor :ap - # @return [Boolean] - attr_accessor :power # FIXME: Consider an enum # @return [Integer] (0, 1, 2) attr_accessor :ap_scanmode diff --git a/src/lib/y2network/dialogs/wireless_expert_settings.rb b/src/lib/y2network/dialogs/wireless_expert_settings.rb index 2cfa79785..68842972e 100644 --- a/src/lib/y2network/dialogs/wireless_expert_settings.rb +++ b/src/lib/y2network/dialogs/wireless_expert_settings.rb @@ -36,8 +36,6 @@ def contents VSpacing(0.2), access_point_widget, VSpacing(0.2), - Left(power_management_widget), - VSpacing(0.2), Left(ap_scan_mode_widget), VSpacing(1) ), diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index 78dc211cb..e8a2c82ea 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -73,6 +73,11 @@ def access_point ) end + def access_point=(value) + @config["WIRELESS_AP"] = value + @connection_config.ap = value + end + # TODO: select backend? probably not needed as we will merge it when new backend will be already ready def_delegators :@connection_config, :wpa_psk, :wpa_psk=, @@ -83,7 +88,8 @@ def access_point :client_key, :client_key=, :client_cert, :client_cert=, :channel, :channel=, - :bitrate, :bitrate= + :bitrate, :bitrate=, + :ap_scanmode, :ap_scanmode= end end end diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index e46bff4a1..b1161f39c 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -90,23 +90,12 @@ def label def init self.value = @settings.access_point end - end - # Widget that enables wifi power management - class WirelessPowerManagement < CWM::CheckBox - # @param settings [Y2network::InterfaceConfigBuilder] - def initialize(settings) - @settings = settings - textdomain "network" - end - - def label - _("Use &Power Management") + def store + @settings.access_point = value end - def init - self.value = true - end + # TODO: help text end # widget to set Scan mode @@ -132,6 +121,16 @@ def minimum def maximum 2 end + + def init + self.value = @settings.ap_scanmode + end + + def store + @settings.ap_scanmode = self.value + end + + # TODO: help text end end end From ccdb4c364eb2ad43a02f06180fc171805389ed43 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 11:03:05 +0200 Subject: [PATCH 187/471] fixes from testing --- src/lib/y2network/dialogs/wireless_expert_settings.rb | 5 +++++ src/lib/y2network/dialogs/wireless_wep_keys.rb | 2 +- src/lib/y2network/widgets/wireless_auth.rb | 1 + src/lib/y2network/widgets/wireless_auth_mode.rb | 3 ++- src/lib/y2network/widgets/wireless_expert.rb | 3 ++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/dialogs/wireless_expert_settings.rb b/src/lib/y2network/dialogs/wireless_expert_settings.rb index 68842972e..aaec5864b 100644 --- a/src/lib/y2network/dialogs/wireless_expert_settings.rb +++ b/src/lib/y2network/dialogs/wireless_expert_settings.rb @@ -76,6 +76,11 @@ def help ) end + # Always open new dialog to work properly in sequence + def should_open_dialog? + true + end + private def channel_widget diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index 3b50293e4..eab878c3b 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -44,7 +44,7 @@ def contents VBox( VSpacing(1), # ComboBox label - Left(ComboBox(Id(:length), _("&Key Length"), [64, 128])), + Left(ComboBox(Id(:length), _("&Key Length"), ["64", "128"])), VSpacing(1), Table( Id(:table), diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index c8b6dc1e1..cb7faf2fb 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -85,6 +85,7 @@ def eap_widget class WirelessWepKeys < CWM::PushButton def initialize(settings) @settings = settings + textdomain "network" end def label diff --git a/src/lib/y2network/widgets/wireless_auth_mode.rb b/src/lib/y2network/widgets/wireless_auth_mode.rb index 6e14e86eb..ffd9bcede 100644 --- a/src/lib/y2network/widgets/wireless_auth_mode.rb +++ b/src/lib/y2network/widgets/wireless_auth_mode.rb @@ -4,11 +4,12 @@ module Y2Network module Widgets class WirelessAuthMode < CWM::ComboBox def initialize(settings) + textdomain "network" + @settings = settings end def init - textdomain "network" self.value = @settings.auth_mode end diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index b1161f39c..7cd29d6df 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -95,7 +95,8 @@ def store @settings.access_point = value end - # TODO: help text + # TODO: help text with explanation what exactly is needed + # TODO: validation of MAC address end # widget to set Scan mode From 23558e9805b5fea942462c43ceaa06b870941984 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 12:04:46 +0200 Subject: [PATCH 188/471] wep keys can be used also with open wep --- src/lib/y2network/widgets/wireless_auth.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index cb7faf2fb..50be8f00d 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -48,8 +48,8 @@ def contents def refresh case auth_mode_widget.value - when "no-encryption", "open" then replace_widget.replace(empty_auth_widget) - when "sharedkey" then replace_widget.replace(wep_keys_widget) + when "no-encryption" then replace_widget.replace(empty_auth_widget) + when "sharedkey", "open" then replace_widget.replace(wep_keys_widget) when "wpa-psk" then replace_widget.replace(encryption_widget) when "wpa-eap" then replace_widget.replace(eap_widget) else From 79fd4a68a041a0ce22f4246ec401ce3b413b5ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 11:41:06 +0100 Subject: [PATCH 189/471] Add a method to rename interfaces and associated connections --- src/lib/y2network/config.rb | 11 +++++++ .../connection_configs_collection.rb | 8 +++++ src/lib/y2network/interface.rb | 9 ++++++ test/y2network/config_test.rb | 32 +++++++++++++++++-- .../connection_configs_collection_test.rb | 13 +++++++- 5 files changed, 70 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index f10c22cbe..1ecb3a9d5 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -129,6 +129,17 @@ def ==(other) routing == other.routing && dns == other.dns end + # Renames a given interface and the associated connections + # + # @param old_name [String] Old interface's name + # @param new_name [String] New interface's name + # @param mechanism [Symbol] Property to base the rename on (:mac or :bus_id) + def rename_interface(old_name, new_name, mechanism) + interface = interfaces.by_name(old_name) + interface.rename(new_name, mechanism) + connections.by_interface(old_name).each { |c| c.interface = new_name } + end + alias_method :eql?, :== end end diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index 5fa3f55ea..7689226ea 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -53,6 +53,14 @@ def by_name(name) connection_configs.find { |c| c.name == name } end + # Returns connection configurations which are associated to the given interface + # + # @param interface_name [String] Interface name + # @return [Array] Associated connection configs + def by_interface(interface_name) + connection_configs.select { |c| c.interface == interface_name } + end + # Adds or updates a connection configuration # # @note It uses the name to do the matching. diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 3e06a0704..bcc6036c6 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -107,6 +107,15 @@ def drivers hardware.drivers end + # Renames the interface + # + # @param new_name [String] New interface's name + # @param mechanism [Symbol] Property to base the rename on (:mac or :bus_id) + def rename(new_name, mechanism) + @name = new_name + @renaming_mechanism = mechanism + end + private def system_config(name) diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 864ae4300..7d19930e9 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -20,6 +20,9 @@ require "y2network/config" require "y2network/routing_table" require "y2network/interface" +require "y2network/interfaces_collection" +require "y2network/connection_config/ethernet" +require "y2network/connection_configs_collection" require "y2network/sysconfig/config_reader" require "y2network/sysconfig/config_writer" @@ -29,7 +32,9 @@ end subject(:config) do - described_class.new(interfaces: [eth0], routing: routing, source: :sysconfig) + described_class.new( + interfaces: interfaces, connections: connections, routing: routing, source: :sysconfig + ) end let(:route1) { Y2Network::Route.new } @@ -39,6 +44,15 @@ let(:table2) { Y2Network::RoutingTable.new([route2]) } let(:eth0) { Y2Network::Interface.new("eth0") } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } + + let(:eth0_conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| + conn.interface = "eth0" + end + end + let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn]) } + let(:routing) { Y2Network::Routing.new(tables: [table1, table2]) } @@ -127,7 +141,7 @@ context "when interfaces list is different" do it "returns false" do - copy.interfaces = [Y2Network::Interface.new("eth1")] + copy.interfaces = Y2Network::InterfacesCollection.new([Y2Network::Interface.new("eth1")]) expect(copy).to_not eq(config) end end @@ -146,4 +160,18 @@ end end end + + describe "#rename_interface" do + it "adjusts the interface name" do + config.rename_interface("eth0", "eth1", :mac) + eth1 = config.interfaces.by_name("eth1") + expect(eth1.renaming_mechanism).to eq(:mac) + end + + it "adjusts the connection configurations for that interface" do + config.rename_interface("eth0", "eth1", :mac) + eth1_conns = config.connections.by_interface("eth1") + expect(eth1_conns).to_not be_empty + end + end end diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb index 347a6129b..2eb72ec0f 100644 --- a/test/y2network/connection_configs_collection_test.rb +++ b/test/y2network/connection_configs_collection_test.rb @@ -26,7 +26,12 @@ subject(:collection) { described_class.new(connections) } let(:connections) { [eth0, wlan0] } - let(:eth0) { Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } } + let(:eth0) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| + conn.name = "eth0" + conn.interface = "eth0" + end + end let(:wlan0) { Y2Network::ConnectionConfig::Wireless.new.tap { |c| c.name = "wlan0" } } describe "#by_name" do @@ -41,6 +46,12 @@ end end + describe "#by_interface" do + it "returns the connection configurations associated to the given interface name" do + expect(collection.by_interface("eth0")).to eq([eth0]) + end + end + describe "#add_or_update" do let(:eth0_1) { Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } } From a26a205b5e036c2097e7927e7fb0eae7258ed451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 11:46:23 +0100 Subject: [PATCH 190/471] Make RuboCop happy --- src/lib/y2network/udev_rule.rb | 7 +++---- test/y2network/config_test.rb | 1 - test/y2network/sysconfig/config_writer_test.rb | 2 +- test/y2network/sysconfig/interfaces_reader_test.rb | 10 ++++++---- test/y2network/udev_rule_test.rb | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index e509e3b8b..535820b36 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -53,10 +53,9 @@ def find_for(device) # @param name [String] Interface's name # @param mac [String] MAC address def new_mac_based_rename(name, mac) - new_network_rule([ - UdevRulePart.new("ATTR{address}", "=", mac), - UdevRulePart.new("NAME", "=", name) - ]) + new_network_rule( + [UdevRulePart.new("ATTR{address}", "=", mac), UdevRulePart.new("NAME", "=", name)] + ) end # Helper method to create a rename rule based on the BUS ID diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 7d19930e9..d4e6f03f0 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -53,7 +53,6 @@ end let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn]) } - let(:routing) { Y2Network::Routing.new(tables: [table1, table2]) } describe ".from" do diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 4f4ebff86..c677a794a 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -84,7 +84,7 @@ let(:dns_writer) { instance_double(Y2Network::Sysconfig::DNSWriter, write: nil) } let(:conn_writer) { instance_double(Y2Network::Sysconfig::ConnectionConfigWriter, write: nil) } - let(:interfaces_writer) { instance_double(Y2Network::Sysconfig::InterfacesWriter, write: nil) } + let(:interfaces_writer) { instance_double(Y2Network::Sysconfig::InterfacesWriter, write: nil) } before do allow(Y2Network::Sysconfig::RoutesFile).to receive(:new) diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index 7c3b4e0b7..8524c9a21 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -35,10 +35,12 @@ end let(:udev_rule) do - Y2Network::UdevRule.new([ - Y2Network::UdevRulePart.new("ATTR{address}", "==", "00:12:34:56:78"), - Y2Network::UdevRulePart.new("ACTION", "=", "eth0") - ]) + Y2Network::UdevRule.new( + [ + Y2Network::UdevRulePart.new("ATTR{address}", "==", "00:12:34:56:78"), + Y2Network::UdevRulePart.new("ACTION", "=", "eth0") + ] + ) end let(:configured_interfaces) { ["lo", "eth0"] } diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index e6147f210..34143591f 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -84,9 +84,9 @@ describe "#add_part" do it "adds a new key/value to the rule" do udev_rule.add_part("ACTION", "==", "add") - expect(udev_rule.parts).to eq([ - Y2Network::UdevRulePart.new("ACTION", "==", "add") - ]) + expect(udev_rule.parts).to eq( + [Y2Network::UdevRulePart.new("ACTION", "==", "add")] + ) end end From a32bc29d695a9e9b4f430c598ec6e85c6ef930f0 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 15:33:13 +0200 Subject: [PATCH 191/471] implement wep keys dialog --- .../y2network/dialogs/wireless_wep_keys.rb | 235 +++++++++++++++--- .../interface_config_builders/wireless.rb | 5 +- src/lib/y2network/widgets/wireless_auth.rb | 2 + src/lib/y2network/widgets/wireless_expert.rb | 2 +- 4 files changed, 209 insertions(+), 35 deletions(-) diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index eab878c3b..577ac5357 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -4,10 +4,10 @@ module Y2Network module Dialogs # Dialog to manage WEP keys class WirelessWepKeys < CWM::Dialog - # @param settings [Y2network::InterfaceConfigBuilder] - def initialize(settings) + # @param builder [Y2network::InterfaceConfigBuilder] + def initialize(builder) textdomain "network" - @settings = settings + @builder = builder end def title @@ -21,14 +21,7 @@ def help "although only one key is used to encrypt the data. This is the default key.\n" \ "The other keys can be used to decrypt data. Usually you have only\n" \ "one key.

    " - ) + - _( - "

    Key Length defines the bit length of your WEP keys.\n" \ - "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" \ - "Some older hardware might not be able to handle 128 bit keys, so if your\n" \ - "wireless LAN connection does not establish, you may need to set this\n" \ - "value to 64.

    " - ) + ) end def contents @@ -44,29 +37,9 @@ def contents VBox( VSpacing(1), # ComboBox label - Left(ComboBox(Id(:length), _("&Key Length"), ["64", "128"])), + Left(WEPKeyLength.new(@builder)), VSpacing(1), - Table( - Id(:table), - Opt(:notify), - Header( - # Table header label - # Abbreviation of Number - _("No."), - # Table header label - _("Key"), - # Table header label - Center(_("Default")) - ) - ), - HBox( - # PushButton label - PushButton(Id(:edit), Yast::Label.EditButton), - # PushButton label - PushButton(Id(:delete), Yast::Label.DeleteButton), - # PushButton label - PushButton(Id(:default), _("&Set as Default")) - ), + WEPKeys.new(@builder), VSpacing(1) ), HSpacing(3) @@ -77,6 +50,202 @@ def contents HSpacing(5) ) end + + # Always open new dialog to work properly in sequence + def should_open_dialog? + true + end + + class WEPKeyLength < CWM::ComboBox + def initialize(builder) + textdomain "network" + + @builder = builder + end + + def items + [ + ["64", "64"], + ["128", "128"] + ] + end + + def init + length_s = @builder.key_length.to_s + self.value = length_s.empty? ? "128" : length_s + end + + def store + @builder.key_length = value.to_i + end + + def label + _("&Key Length") + end + + def help + _( + "

    Key Length defines the bit length of your WEP keys.\n" \ + "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" \ + "Some older hardware might not be able to handle 128 bit keys, so if your\n" \ + "wireless LAN connection does not establish, you may need to set this\n" \ + "value to 64.

    " + ) + end + end + + class WEPKeys < CWM::CustomWidget + def initialize(settings) + textdomain "network" + @settings = settings + end + + def contents + VBox( + Table( + Id(:wep_keys_table), + Header( + # Table header label + # Abbreviation of Number + _("No."), + # Table header label + _("Key"), + # Table header label + Center(_("Default")) + ) + ), + HBox( + # PushButton label + PushButton(Id(:wep_keys_add), Yast::Label.AddButton), + # PushButton label + PushButton(Id(:wep_keys_edit), Yast::Label.EditButton), + # PushButton label + PushButton(Id(:wep_keys_delete), Yast::Label.DeleteButton), + # PushButton label + PushButton(Id(:wep_keys_default), _("&Set as Default")) + ) + ) + end + + # TODO: help text which explain format of WEP keys + + def init + refresh_table + end + + def refresh_table + table_items = @settings.keys.each_with_index.map do |key, i| + next unless key + Item(Id(i), i.to_s, key, i == @settings.default_key ? "X" : "") + end + + Yast::UI.ChangeWidget(Id(:wep_keys_table), :Items, table_items.compact) + [:wep_keys_delete, :wep_keys_edit, :wep_keys_default].each do |k| + Yast::UI.ChangeWidget( + Id(k), + :Enabled, + !@settings.keys.compact.empty? + ) + end + Yast::UI.ChangeWidget( + Id(:wep_keys_add), + :Enabled, + @settings.keys.compact.size < 4 # only 4 keys are possible + ) + end + + # @return [Symbol, nil] dialog result + def handle(event) + return nil if event["EventReason"] != "Activated" + + cur = Yast::UI.QueryWidget(Id(:wep_keys_table), :CurrentItem).to_i + case event["ID"] + when :wep_keys_edit + key = dialog(@settings.keys[cur]) + if key + @settings.keys[cur] = key + refresh_table + Yast::UI.ChangeWidget(Id(:wep_keys_table), :CurrentItem, cur) + end + when :wep_keys_add + key = dialog + if key + # replace first nil value + index = @settings.keys.index(nil) + if index + @settings.keys[index] = key + else + @settings.keys << key + end + log.info "new keys #{@settings.keys.inspect}" + refresh_table + Yast::UI.ChangeWidget( + Id(:wep_keys_table), + :CurrentItem, + @settings.keys.compact.size - 1 + ) + end + when :wep_keys_delete + @settings.keys.delete_at(cur) + refresh_table + when :wep_keys_default + @settings.default_key = cur + refresh_table + Yast::UI.ChangeWidget(Id(:wep_keys_table), :CurrentItem, cur) + end + + nil + end + + # Open a dialog to add/edit a key. + # TODO: own class for it + # @param value [String, nil] existing key to edit or nil for new key. + # @return [String, nil] key or nil if dialog is canceled + def dialog(value = nil) + value ||= "" + Yast::UI.OpenDialog( + Opt(:decorated), + VBox( + HSpacing(1), + # TextEntry label + TextEntry(Id(:key), _("&WEP Key"), value), + HSpacing(1), + HBox( + PushButton(Id(:ok), Opt(:default), Yast::Label.OKButton), + PushButton(Id(:cancel), Yast::Label.CancelButton) + ) + ) + ) + + Yast::UI.SetFocus(Id(:key)) + val = nil + while (ret = Yast::UI.UserInput) == :ok + val = Yast::UI.QueryWidget(Id(:key), :Value) + if !valid_key(val) + # Popup::Error text + Yast::Popup.Error( + _( + "The WEP key is not valid. WEP key can be specified either directly in hex " \ + "digits, with or without dashes, or in the key's ASCII representation " \ + "(prefix s: ), or as a passphrase which will be hashed (prefix h: )." + ) + ) + next + end + break + end + + Yast::UI.CloseDialog + return nil if ret != :ok + + val + end + + def valid_key(_key) + # TODO: write validation + true + end + end end end end diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index e8a2c82ea..e0dcf1691 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -89,7 +89,10 @@ def access_point=(value) :client_cert, :client_cert=, :channel, :channel=, :bitrate, :bitrate=, - :ap_scanmode, :ap_scanmode= + :ap_scanmode, :ap_scanmode=, + :keys, :keys=, + :key_length, :key_length=, + :default_key, :default_key= end end end diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index 50be8f00d..71230f2ca 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -94,6 +94,8 @@ def label def handle Y2Network::Dialogs::WirelessWepKeys.run(@settings) + + nil end end end diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index 7cd29d6df..5b65b810d 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -128,7 +128,7 @@ def init end def store - @settings.ap_scanmode = self.value + @settings.ap_scanmode = value end # TODO: help text From cbddd5fdaa740bb730354579d8dadf89bb814146 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 16:27:07 +0200 Subject: [PATCH 192/471] remove test for no longer existing widget --- test/y2network/widgets/wireless_expert_test.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/y2network/widgets/wireless_expert_test.rb b/test/y2network/widgets/wireless_expert_test.rb index 9a13bd28a..36d9c7777 100644 --- a/test/y2network/widgets/wireless_expert_test.rb +++ b/test/y2network/widgets/wireless_expert_test.rb @@ -44,13 +44,6 @@ include_examples "CWM::InputField" end -describe Y2Network::Widgets::WirelessPowerManagement do - let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } - subject { described_class.new(builder) } - - include_examples "CWM::CheckBox" -end - describe Y2Network::Widgets::WirelessAPScanMode do let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } subject { described_class.new(builder) } From 183e17ad385c1f1704b02de5103bb59b60c36f86 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 16:58:18 +0200 Subject: [PATCH 193/471] remove no longer needed client --- src/clients/wireless_test.rb | 37 ------------------------------------ 1 file changed, 37 deletions(-) delete mode 100644 src/clients/wireless_test.rb diff --git a/src/clients/wireless_test.rb b/src/clients/wireless_test.rb deleted file mode 100644 index fdb45e1d0..000000000 --- a/src/clients/wireless_test.rb +++ /dev/null @@ -1,37 +0,0 @@ -require "yast" -require "y2network/dialogs/wireless" -require "y2network/interface_config_builder" - -module Yast - class Wireless < Client - def main - Yast.import "UI" - textdomain "network" - Yast.import "Lan" - Yast.import "NetworkService" - - Wizard.CreateDialog - Wizard.SetDesktopTitleAndIcon("routing") - Wizard.SetNextButton(:next, Label.FinishButton) - - Lan.Read(:cache) - config = Lan.yast_config.copy - interface = LanItems.find_type_ifaces("wlan").first - - if interface - LanItems.FindAndSelect(interface) - connection_config = config.connections.by_name(LanItems.GetCurrentName) - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) - builder.name = LanItems.GetCurrentName() - LanItems.SetItem(builder: builder) - Y2Network::Dialogs::Wireless.run(builder) - else - Yast::Popup.Error("No interface to configure") - end - - UI.CloseDialog - end - end -end - -Yast::Wireless.new.main From 1cf797b6f80a6a1760d51e2a53b3a21d827c98e3 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 17:00:24 +0200 Subject: [PATCH 194/471] add test for wireless wep keys dialog --- .../y2network/dialogs/wireless_wep_keys.rb | 2 ++ .../dialogs/wireless_wep_keys_test.rb | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 test/y2network/dialogs/wireless_wep_keys_test.rb diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index 577ac5357..cf024ce5f 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -1,4 +1,6 @@ require "cwm/dialog" +require "cwm/custom_widget" +require "cwm/common_widgets" module Y2Network module Dialogs diff --git a/test/y2network/dialogs/wireless_wep_keys_test.rb b/test/y2network/dialogs/wireless_wep_keys_test.rb new file mode 100644 index 000000000..5f187529f --- /dev/null +++ b/test/y2network/dialogs/wireless_wep_keys_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/dialogs/wireless_wep_keys" +require "y2network/interface_config_builder" + +describe Y2Network::Dialogs::WirelessWepKeys do + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("wlan")) } + + include_examples "CWM::Dialog" +end From 80e3cf7e2eec9e6740d1c8b2b20b92ba2921713d Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 21 Aug 2019 17:05:52 +0200 Subject: [PATCH 195/471] add more automatic tests --- test/y2network/widgets/wireless_auth_test.rb | 31 +++++++++++++++++++ test/y2network/widgets/wireless_essid_test.rb | 31 +++++++++++++++++++ test/y2network/widgets/wireless_test.rb | 31 +++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 test/y2network/widgets/wireless_auth_test.rb create mode 100644 test/y2network/widgets/wireless_essid_test.rb create mode 100644 test/y2network/widgets/wireless_test.rb diff --git a/test/y2network/widgets/wireless_auth_test.rb b/test/y2network/widgets/wireless_auth_test.rb new file mode 100644 index 000000000..df67d27b4 --- /dev/null +++ b/test/y2network/widgets/wireless_auth_test.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/wireless_auth" +require "y2network/interface_config_builder" + +describe Y2Network::Widgets::WirelessAuth do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" +end diff --git a/test/y2network/widgets/wireless_essid_test.rb b/test/y2network/widgets/wireless_essid_test.rb new file mode 100644 index 000000000..adf6d6031 --- /dev/null +++ b/test/y2network/widgets/wireless_essid_test.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/wireless_essid" +require "y2network/interface_config_builder" + +describe Y2Network::Widgets::WirelessEssid do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" +end diff --git a/test/y2network/widgets/wireless_test.rb b/test/y2network/widgets/wireless_test.rb new file mode 100644 index 000000000..d8329cf7d --- /dev/null +++ b/test/y2network/widgets/wireless_test.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/wireless" +require "y2network/interface_config_builder" + +describe Y2Network::Widgets::Wireless do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" +end From 773e4c8d3bfbd43a0af035b8be97600ee68b824a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 16:56:33 +0100 Subject: [PATCH 196/471] Add support InterfaceConfigBuilder to rename interfaces --- src/lib/y2network/interface_config_builder.rb | 46 ++++++++++++- .../interface_config_builder_test.rb | 66 ++++++++++++++++++- 2 files changed, 109 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index c805a9956..f012713f5 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -50,7 +50,7 @@ def self.for(type, config: nil) require "y2network/interface_config_builders/#{type.file_name}" InterfaceConfigBuilders.const_get(type.class_name).new(config: config) rescue LoadError => e - log.info "Specialed builder for #{type} not found. Fallbacking to default. #{e.inspect}" + log.info "Specialized builder for #{type} not found. Falling back to default. #{e.inspect}" new(type: type, config: config) end @@ -93,7 +93,8 @@ def save @connection_config.name = name @connection_config.interface = name - Yast::Lan.yast_config.connections.add_or_update(@connection_config) + yast_config.connections.add_or_update(@connection_config) + yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? # create new instance as name can change firewall_interface = Y2Firewall::Firewalld::Interface.new(name) @@ -108,6 +109,40 @@ def save nil end + # Determines whether the interface has been renamed + # + # @return [Boolean] true if it was renamed; false otherwise + def renamed_interface? + name != interface.name || @renaming_mechanism != interface.renaming_mechanism + end + + # Renames the interface + # + # @param new_name [String] New interface's name + # @param renaming_mechanism [Symbol,nil] Mechanism to rename the interface + # (nil -no rename-, :mac or :bus_id) + def rename_interface(new_name, renaming_mechanism) + @old_name ||= name + self.name = new_name + @renaming_mechanism = renaming_mechanism + end + + # Returns the current renaming mechanism + # + # @return [Symbol,nil] Mechanism to rename the interface (nil -no rename-, :mac or :bus_id) + def renaming_mechanism + @renaming_mechanism || interface.renaming_mechanism + end + + # Returns the underlying interface + # + # If the interface has been renamed, take the old name into account. + # + # @return [Y2Network::Interface,nil] + def interface + @interface ||= yast_config.interfaces.by_name(@old_name || name) + end + # how many device names is proposed NEW_DEVICES_COUNT = 10 # Proposes bunch of possible names for interface @@ -602,5 +637,12 @@ def save_aliases_to_connection ) end end + + # Helper method to access to the current configuration + # + # @return [Y2Network::Config] + def yast_config + Yast::Lan.yast_config + end end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 63ea9e27f..b5eaa9e2d 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -4,6 +4,8 @@ require "yast" require "y2network/interface_config_builder" +require "y2network/interfaces_collection" +require "y2network/physical_interface" Yast.import "Lan" @@ -14,7 +16,9 @@ res end - let(:config) { Y2Network::Config.new(source: :sysconfig) } + let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :sysconfig) } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } + let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } before do allow(Yast::Lan).to receive(:yast_config).and_return(config) @@ -78,6 +82,25 @@ expect(ip_alias.address).to eq(Y2Network::IPAddress.new("10.0.0.0", 24)) expect(ip_alias.label).to eq("test") end + + context "when interface was renamed" do + before do + subject.rename_interface("eth2", :mac) + end + + it "updates the name in the configuration" do + expect(Yast::Lan.yast_config).to receive(:rename_interface) + .with("eth0", "eth2", :mac) + subject.save + end + end + + context "when interface was not renamed" do + it "does not alter the name" do + expect(Yast::Lan.yast_config).to_not receive(:rename_interface) + subject.save + end + end end describe "#new_device_startmode" do @@ -169,4 +192,45 @@ end end end + + describe "#rename_interface" do + it "updates the interface name" do + expect { config_builder.rename_interface("eth2", :mac) } + .to change { config_builder.name }.from("eth0").to("eth2") + end + + it "updates the renaming mechanism" do + expect { config_builder.rename_interface("eth2", :mac) } + .to change { config_builder.renaming_mechanism }.from(nil).to(:mac) + end + end + + describe "#renamed_interface?" do + context "when the interface has been renamed" do + it "returns false" do + expect(config_builder.renamed_interface?).to eq(false) + end + end + + context "when the interface has been renamed" do + before do + config_builder.rename_interface("eth2", :mac) + end + + it "returns true" do + expect(config_builder.renamed_interface?).to eq(true) + end + end + + context "when the old name and mechanism have been restored " do + before do + config_builder.rename_interface("eth2", :mac) + end + + it "returns false" do + config_builder.rename_interface("eth0", nil) + expect(config_builder.renamed_interface?).to eq(false) + end + end + end end From c08f47590f668447021fdc42aa3fdf32eeb1726a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 17:05:23 +0100 Subject: [PATCH 197/471] Adapt EditNicName widget to use the new renaming API --- src/lib/network/edit_nic_name.rb | 51 ++++++++----------------- src/lib/y2network/widgets/udev_rules.rb | 2 +- test/network/edit_nic_name_test.rb | 21 +++++----- 3 files changed, 26 insertions(+), 48 deletions(-) diff --git a/src/lib/network/edit_nic_name.rb b/src/lib/network/edit_nic_name.rb index d84a740d7..f1d15fff9 100644 --- a/src/lib/network/edit_nic_name.rb +++ b/src/lib/network/edit_nic_name.rb @@ -19,33 +19,17 @@ class EditNicName # @return [String] current udev match criteria attr_reader :old_key - # udev rule attribute for MAC address - MAC_UDEV_ATTR = "ATTR{address}".freeze - - # udev rule attribute for BUS id - BUSID_UDEV_ATTR = "KERNELS".freeze - - def initialize + # Constructor + # + # @param [Y2Network::InterfaceConfigBuilder] Interface configuration + def initialize(settings) textdomain "network" - - Yast.include self, "network/routines.rb" - - current_item = LanItems.getCurrentItem - current_rule = LanItems.current_udev_rule - - @old_name = LanItems.current_udev_name - unless current_rule.empty? - @old_key = :mac unless LanItems.GetItemUdev(MAC_UDEV_ATTR).empty? - @old_key = :bus_id unless LanItems.GetItemUdev(BUSID_UDEV_ATTR).empty? - end - - if current_item["hwinfo"] - @mac = current_item["hwinfo"]["permanent_mac"] - @bus_id = current_item["hwinfo"]["busid"] - else - @mac = "" - @bus_id = "" - end + @settings = settings + interface = settings.interface + @old_name = interface.name + @old_key = interface.renaming_mechanism + @mac = interface.hardware.mac + @bus_id = interface.hardware.busid end # Opens dialog for editing NIC name and runs event loop. @@ -61,22 +45,16 @@ def run next if ret != :ok new_name = UI.QueryWidget(:dev_name, :Value) + udev_type = UI.QueryWidget(:udev_type, :CurrentButton) if CheckUdevNicName(new_name) - LanItems.rename(new_name) + @settings.rename_interface(new_name, udev_type) else UI.SetFocus(:dev_name) ret = nil next end - - udev_type = UI.QueryWidget(:udev_type, :CurrentButton) - - # FIXME: it changes udev key used for device identification - # and / or its value only, name is changed elsewhere - LanItems.update_item_udev_rule!(udev_type) if udev_type && (old_key != udev_type) - LanItems.rename_current_device_in_routing(old_name) if new_name != old_name end close @@ -146,11 +124,12 @@ def close # @return [boolean] false if name is invalid def CheckUdevNicName(name) # check if the name is assigned to another device already - if LanItems.GetNetcardNames.include?(name) && name != LanItems.GetCurrentName + if @settings.name_exists?(name) Popup.Error(_("Configuration name already exists.")) return false end - if !ValidNicName(name) + + if !@settings.valid_name?(name) Popup.Error(_("Invalid configuration name.")) return false end diff --git a/src/lib/y2network/widgets/udev_rules.rb b/src/lib/y2network/widgets/udev_rules.rb index 60dacef04..c0a1d0cfa 100644 --- a/src/lib/y2network/widgets/udev_rules.rb +++ b/src/lib/y2network/widgets/udev_rules.rb @@ -27,7 +27,7 @@ def init end def handle - self.value = Yast::EditNicName.new.run + self.value = Yast::EditNicName.new(@settings).run nil end diff --git a/test/network/edit_nic_name_test.rb b/test/network/edit_nic_name_test.rb index 9082f3ecc..c7744b8af 100755 --- a/test/network/edit_nic_name_test.rb +++ b/test/network/edit_nic_name_test.rb @@ -10,12 +10,13 @@ require "y2network/routing_table" require "y2network/interfaces_collection" require "y2network/interface" +require "y2network/interface_config_builder" require "y2network/config" Yast.import "LanItems" describe Yast::EditNicName do - let(:subject) { described_class.new } + let(:subject) { described_class.new(builder) } let(:current_name) { "spec0" } let(:new_name) { "new1" } let(:existing_new_name) { "existing_new_name" } @@ -29,6 +30,10 @@ let(:yast_config) do Y2Network::Config.new(interfaces: ifaces, routing: routing, source: :sysconfig) end + let(:builder) do + instance_double(Y2Network::InterfaceConfigBuilder, interface: iface, + name_exists?: false, valid_name?: true, rename_interface: nil) + end before do allow(Y2Network::Config).to receive(:find).and_return(yast_config) @@ -91,16 +96,10 @@ it "asks for new user input when name already exists" do allow(Yast::UI).to receive(:QueryWidget) .with(:dev_name, :Value).and_return(existing_new_name, new_name) - expect(subject).to receive(:CheckUdevNicName).with(existing_new_name).and_return(false) - expect(subject).to receive(:CheckUdevNicName).with(new_name).and_return(true) - expect(Yast::UI).to receive(:SetFocus) - expect(Yast::LanItems).to receive(:rename).with(new_name) - subject.run - end - - it "updates the Routing devices list with the new name" do - expect(Yast::LanItems).to receive(:rename_current_device_in_routing) - .with("spec0") + allow(subject).to receive(:CheckUdevNicName).with(existing_new_name).and_return(false) + allow(subject).to receive(:CheckUdevNicName).with(new_name).and_return(true) + allow(Yast::UI).to receive(:SetFocus) + expect(builder).to receive(:rename_interface).with(new_name, :mac) subject.run end From 9f47cad5a8244b1e04754a92a000526a50fd0e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 17:06:45 +0100 Subject: [PATCH 198/471] Makes sure that hardware information is available when needed --- src/lib/y2network/sysconfig/interfaces_reader.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 859ed3a79..cc35bc378 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -75,12 +75,25 @@ def interfaces # Physical interfaces are read from the old LanItems module def find_physical_interfaces return if @interfaces - physical_interfaces = Yast::LanItems.Hardware.map do |h| + physical_interfaces = hardware.map do |h| build_physical_interface(h) end @interfaces = Y2Network::InterfacesCollection.new(physical_interfaces) end + # Returns hardware information + # + # This method makes sure that the hardware information was read. + # + # @todo It still relies on Yast::LanItems.Hardware + # + # @return [Array] Hardware information + def hardware + Yast::LanItems.Hardware unless Yast::LanItems.Hardware.empty? + Yast::LanItems.Read # try again if no hardware was found + Yast::LanItems.Hardware + end + # Finds the connections configurations def find_connections @connections ||= From e1b7f78685d85e5b948d5407784f33cea3123e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 23:01:13 +0100 Subject: [PATCH 199/471] Updates from code review --- src/lib/y2network/sysconfig/interfaces_writer.rb | 4 ++-- src/lib/y2network/udev_rule.rb | 6 +++--- src/lib/y2network/udev_rule_part.rb | 9 ++++++++- test/y2network/sysconfig/interfaces_writer_test.rb | 6 +++--- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index ccf5d84d5..d79a7aa1b 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -56,8 +56,8 @@ def udev_rule_for(iface) # Refreshes udev service def update_udevd - Yast::Execute.on_target!("/usr/bin/udevadm", "control", "--reload") - Yast::Execute.on_target!("/usr/bin/udevadm", "trigger", "--subsystem-match=net", "--action=add") + Yast::Execute.on_target("/usr/bin/udevadm", "control", "--reload") + Yast::Execute.on_target("/usr/bin/udevadm", "trigger", "--subsystem-match=net", "--action=add") end end end diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 535820b36..479d33944 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -65,8 +65,8 @@ def new_mac_based_rename(name, mac) # @param dev_port [String] Device port def new_bus_id_based_rename(name, bus_id, dev_port = nil) parts = [UdevRulePart.new("KERNELS", "=", bus_id)] - parts.push(UdevRulePart.new("ATTR{dev_port}", "=", dev_port)) if dev_port - parts.push(UdevRulePart.new("NAME", "=", name)) + parts << UdevRulePart.new("ATTR{dev_port}", "=", dev_port) if dev_port + parts << UdevRulePart.new("NAME", "=", name) new_network_rule(parts) end @@ -91,7 +91,7 @@ def new_network_rule(parts = []) # @param udev_rules [Array] List of udev rules def write(udev_rules) Yast::SCR.Write(Yast::Path.new(".udev_persistent.rules"), udev_rules.map(&:to_s)) - Yast::SCR.Write(Yast::Path.new(".udev_persistent.nil"), []) + Yast::SCR.Write(Yast::Path.new(".udev_persistent.nil"), []) # Writes changes to the rules file end end diff --git a/src/lib/y2network/udev_rule_part.rb b/src/lib/y2network/udev_rule_part.rb index 1306dba84..cce777152 100644 --- a/src/lib/y2network/udev_rule_part.rb +++ b/src/lib/y2network/udev_rule_part.rb @@ -35,6 +35,12 @@ class << self # part.operator #=> "==" # part.value #=> "add" # + # @example Using globs + # part = UdevRulePart.from_string('ATTR{address}=='"?*31:78:f2"') + # part.key #=> "ATTR{æddress}" + # part.operator #=> "==" + # part.value #=> "\"?*31:78:f2\"" + # @param str [String] string form of an udev rule # @return [UdevRule] udev rule object def from_string(str) @@ -45,7 +51,8 @@ def from_string(str) end # @return [String] Key name attr_accessor :key - # @return [String] Operator ("==", "!=", "=", "+=", "-=", ":=") + # @return [String] Operator. There are two comparison operators ("==", "!=") and four assignment + # operators ("=", "+=", "-=", ":="). See udev(7) for further information. attr_accessor :operator # @return [String] Value to match or assign attr_accessor :value diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index d1fabfd2d..f95d6a843 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -37,7 +37,7 @@ let(:renaming_mechanism) { nil } before do - allow(Yast::Execute).to receive(:on_target!) + allow(Yast::Execute).to receive(:on_target) allow(eth0).to receive(:hardware).and_return(hardware) end @@ -81,8 +81,8 @@ end it "refreshes udev" do - expect(Yast::Execute).to receive(:on_target!).with("/usr/bin/udevadm", "control", any_args) - expect(Yast::Execute).to receive(:on_target!).with("/usr/bin/udevadm", "trigger", any_args) + expect(Yast::Execute).to receive(:on_target).with("/usr/bin/udevadm", "control", any_args) + expect(Yast::Execute).to receive(:on_target).with("/usr/bin/udevadm", "trigger", any_args) subject.write(interfaces) end end From a86ac23ae7254b3ab37a21d466fcd6312430b555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 23:05:08 +0100 Subject: [PATCH 200/471] Documentation fixes --- src/lib/network/edit_nic_name.rb | 2 +- src/lib/y2network/udev_rule.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/network/edit_nic_name.rb b/src/lib/network/edit_nic_name.rb index f1d15fff9..56d30c94f 100644 --- a/src/lib/network/edit_nic_name.rb +++ b/src/lib/network/edit_nic_name.rb @@ -21,7 +21,7 @@ class EditNicName # Constructor # - # @param [Y2Network::InterfaceConfigBuilder] Interface configuration + # @param settings [Y2Network::InterfaceConfigBuilder] Interface configuration def initialize(settings) textdomain "network" @settings = settings diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 479d33944..7810249d9 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -61,7 +61,7 @@ def new_mac_based_rename(name, mac) # Helper method to create a rename rule based on the BUS ID # # @param name [String] Interface's name - # @param mac [String] BUS ID (e.g., "0000:08:00.0") + # @param bus_id [String] BUS ID (e.g., "0000:08:00.0") # @param dev_port [String] Device port def new_bus_id_based_rename(name, bus_id, dev_port = nil) parts = [UdevRulePart.new("KERNELS", "=", bus_id)] @@ -100,7 +100,7 @@ def write(udev_rules) # Constructor # - # @param [Array] udev rule parts + # @param parts [Array] udev rule parts def initialize(parts = []) @parts = parts end From f81da7943e1bba0eda4eea3b6ad91c00a312d4d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 23:19:21 +0100 Subject: [PATCH 201/471] Do not crash in the interface is not found in InterfaceConfigBuilder --- src/lib/y2network/interface_config_builder.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index f012713f5..3ef278e87 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -113,6 +113,7 @@ def save # # @return [Boolean] true if it was renamed; false otherwise def renamed_interface? + return false unless interface name != interface.name || @renaming_mechanism != interface.renaming_mechanism end From 3b46fd7f7462ca6252c01db499b01eb5c9735899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 21 Aug 2019 23:26:44 +0100 Subject: [PATCH 202/471] Fix test suite * Tests were passing but the scenarios were wrong. --- test/default_route_test.rb | 6 +++++- test/y2network/interface_config_builders/infiniband_test.rb | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/default_route_test.rb b/test/default_route_test.rb index 10098d0fe..651d42db0 100755 --- a/test/default_route_test.rb +++ b/test/default_route_test.rb @@ -4,13 +4,17 @@ require "network/install_inf_convertor" require "y2network/interface_config_builder" +require "y2network/interfaces_collection" +require "y2network/physical_interface" Yast.import "Lan" describe "Yast::LanItemsClass" do subject { Yast::LanItems } - let(:config) { Y2Network::Config.new(source: :sysconfig) } + let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :sysconfig) } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } + let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } before do allow(Yast::Lan).to receive(:yast_config).and_return(config) diff --git a/test/y2network/interface_config_builders/infiniband_test.rb b/test/y2network/interface_config_builders/infiniband_test.rb index 9ad2abdb2..0c95c0df2 100644 --- a/test/y2network/interface_config_builders/infiniband_test.rb +++ b/test/y2network/interface_config_builders/infiniband_test.rb @@ -4,6 +4,8 @@ require "yast" require "y2network/interface_config_builders/infiniband" +require "y2network/interfaces_collection" +require "y2network/physical_interface" describe Y2Network::InterfaceConfigBuilders::Infiniband do subject(:config_builder) do @@ -12,7 +14,9 @@ res end - let(:config) { Y2Network::Config.new(source: :sysconfig) } + let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :sysconfig) } + let(:interfaces) { Y2Network::InterfacesCollection.new([ib0]) } + let(:ib0) { Y2Network::PhysicalInterface.new("ib0") } before do allow(Yast::Lan).to receive(:yast_config).and_return(config) From 4acfc408719bfc646c326c017b5463ec450e042f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 22 Aug 2019 09:59:06 +0100 Subject: [PATCH 203/471] Update from code review --- src/lib/y2network/interface.rb | 4 ++++ test/y2network/config_test.rb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index bcc6036c6..12085c76a 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -17,6 +17,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "yast" require "y2network/interface_type" require "y2network/hwinfo" @@ -35,6 +36,8 @@ module Y2Network # @see Y2Network::VirtualInterface # @see Y2Network::FakeInterface class Interface + include Yast::Logger + # @return [String] Device name ('eth0', 'wlan0', etc.) attr_accessor :name # @return [String] Interface description @@ -112,6 +115,7 @@ def drivers # @param new_name [String] New interface's name # @param mechanism [Symbol] Property to base the rename on (:mac or :bus_id) def rename(new_name, mechanism) + log.info "Rename interface '#{name}' to '#{new_name}' using the '#{mechanism}'" @name = new_name @renaming_mechanism = mechanism end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index d4e6f03f0..4f54200e2 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -172,5 +172,21 @@ eth1_conns = config.connections.by_interface("eth1") expect(eth1_conns).to_not be_empty end + + context "when the interface is renamed twice" do + it "adjusts the interface name to the last name" do + config.rename_interface("eth0", "eth1", :mac) + config.rename_interface("eth1", "eth2", :bios_id) + eth2 = config.interfaces.by_name("eth2") + expect(eth2.renaming_mechanism).to eq(:bios_id) + end + + it "adjusts the connection configurations for that interface using the last name" do + config.rename_interface("eth0", "eth1", :mac) + config.rename_interface("eth1", "eth2", :mac) + eth2_conns = config.connections.by_interface("eth2") + expect(eth2_conns).to_not be_empty + end + end end end From df2c83fb8fdbdc3b430d83ad00c5df0c2906c9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 22 Aug 2019 10:09:49 +0100 Subject: [PATCH 204/471] Update from code review --- src/lib/y2network/udev_rule.rb | 18 +++++++++++++++++- test/y2network/udev_rule_test.rb | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 7810249d9..572453e4e 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -42,7 +42,6 @@ class << self # @param device [String] Network device name # @return [UdevRule] udev rule def find_for(device) - rules_map = Yast::SCR.Read(Yast::Path.new(".udev_persistent.net")) || {} return nil unless rules_map.key?(device) parts = rules_map[device].map { |p| UdevRulePart.from_string(p) } new(parts) @@ -81,6 +80,9 @@ def new_network_rule(parts = []) UdevRulePart.new("SUBSYSTEM", "==", "net"), UdevRulePart.new("ACTION", "==", "add"), UdevRulePart.new("DRIVERS", "==", "?*"), + # Ethernet devices + # https://github.com/torvalds/linux/blob/bb7ba8069de933d69cb45dd0a5806b61033796a3/include/uapi/linux/if_arp.h#L31 + # TODO: what about InfiniBand (it is type 32)? UdevRulePart.new("ATTR{type}", "==", "1") ] new(base_parts.concat(parts)) @@ -93,6 +95,20 @@ def write(udev_rules) Yast::SCR.Write(Yast::Path.new(".udev_persistent.rules"), udev_rules.map(&:to_s)) Yast::SCR.Write(Yast::Path.new(".udev_persistent.nil"), []) # Writes changes to the rules file end + + # Clears rules cache map + def reset_cache + @rules_map = nil + end + + private + + # Returns the rules map + # + # @return [Hash>] Rules parts (as strings) indexed by interface name + def rules_map + @rules_map ||= Yast::SCR.Read(Yast::Path.new(".udev_persistent.net")) || {} + end end # @return [Array] Parts of the udev rule diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index 34143591f..c0541b99b 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -23,6 +23,8 @@ describe Y2Network::UdevRule do subject(:udev_rule) { described_class.new(parts) } + before { described_class.reset_cache } + let(:parts) { [] } let(:udev_persistent) do From ea1b6a74ef3dc35fdefab8a43ffbb53ca5e2f6d7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 22 Aug 2019 14:20:48 +0200 Subject: [PATCH 205/471] changes from review --- .../dialogs/wireless_expert_settings.rb | 27 ++++++- .../y2network/dialogs/wireless_wep_keys.rb | 76 +++++++++++-------- .../y2network/widgets/additional_addresses.rb | 19 +++++ src/lib/y2network/widgets/address_tab.rb | 19 +++++ src/lib/y2network/widgets/blink_button.rb | 19 +++++ src/lib/y2network/widgets/bond_options.rb | 19 +++++ src/lib/y2network/widgets/bond_slave.rb | 19 +++++ src/lib/y2network/widgets/bond_slaves_tab.rb | 19 +++++ src/lib/y2network/widgets/boot_protocol.rb | 19 +++++ src/lib/y2network/widgets/bridge_ports.rb | 19 +++++ .../y2network/widgets/bridge_slaves_tab.rb | 19 +++++ src/lib/y2network/widgets/client_cert_path.rb | 19 +++++ src/lib/y2network/widgets/client_key_path.rb | 19 +++++ src/lib/y2network/widgets/destination.rb | 19 +++++ src/lib/y2network/widgets/devices.rb | 19 +++++ src/lib/y2network/widgets/ethtools_options.rb | 19 +++++ src/lib/y2network/widgets/gateway.rb | 19 +++++ src/lib/y2network/widgets/general_tab.rb | 19 +++++ src/lib/y2network/widgets/hardware_tab.rb | 19 +++++ src/lib/y2network/widgets/ifplugd_priority.rb | 19 +++++ src/lib/y2network/widgets/interface_name.rb | 19 +++++ src/lib/y2network/widgets/interface_type.rb | 19 +++++ src/lib/y2network/widgets/ip4_forwarding.rb | 19 +++++ src/lib/y2network/widgets/ip6_forwarding.rb | 19 +++++ src/lib/y2network/widgets/ip_address.rb | 19 +++++ src/lib/y2network/widgets/ipoib_mode.rb | 19 +++++ src/lib/y2network/widgets/kernel_module.rb | 19 +++++ src/lib/y2network/widgets/kernel_options.rb | 19 +++++ src/lib/y2network/widgets/mtu.rb | 19 +++++ src/lib/y2network/widgets/netmask.rb | 19 +++++ src/lib/y2network/widgets/path_widget.rb | 19 +++++ src/lib/y2network/widgets/remote_ip.rb | 19 +++++ src/lib/y2network/widgets/route_options.rb | 19 +++++ src/lib/y2network/widgets/routing_buttons.rb | 19 +++++ src/lib/y2network/widgets/routing_table.rb | 19 +++++ src/lib/y2network/widgets/s390_button.rb | 19 +++++ src/lib/y2network/widgets/server_ca_path.rb | 19 +++++ src/lib/y2network/widgets/slave_items.rb | 19 +++++ src/lib/y2network/widgets/startmode.rb | 19 +++++ src/lib/y2network/widgets/tunnel.rb | 19 +++++ src/lib/y2network/widgets/udev_rules.rb | 19 +++++ src/lib/y2network/widgets/vlan_id.rb | 19 +++++ src/lib/y2network/widgets/vlan_interface.rb | 19 +++++ src/lib/y2network/widgets/wireless.rb | 19 +++++ src/lib/y2network/widgets/wireless_auth.rb | 19 +++++ .../y2network/widgets/wireless_auth_mode.rb | 19 +++++ src/lib/y2network/widgets/wireless_eap.rb | 2 +- .../y2network/widgets/wireless_eap_mode.rb | 19 +++++ src/lib/y2network/widgets/wireless_essid.rb | 27 +++++-- src/lib/y2network/widgets/wireless_expert.rb | 20 +++++ src/lib/y2network/widgets/wireless_mode.rb | 19 +++++ .../y2network/widgets/wireless_password.rb | 19 +++++ src/lib/y2network/widgets/wireless_tab.rb | 19 +++++ 53 files changed, 1021 insertions(+), 43 deletions(-) diff --git a/src/lib/y2network/dialogs/wireless_expert_settings.rb b/src/lib/y2network/dialogs/wireless_expert_settings.rb index aaec5864b..247dc2fe8 100644 --- a/src/lib/y2network/dialogs/wireless_expert_settings.rb +++ b/src/lib/y2network/dialogs/wireless_expert_settings.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/dialog" require "y2network/widgets/wireless" @@ -7,7 +26,7 @@ module Y2Network module Dialogs # Dialog that shows when expert button is clicked on wireless tab. class WirelessExpertSettings < CWM::Dialog - # @param settings [InterfaceBuilder] object holding interface configuration + # @param settings [InterfaceConfigBuilder] object holding interface configuration # modified by the dialog. def initialize(settings) @settings = settings @@ -30,13 +49,13 @@ def contents HSpacing(2), VBox( VSpacing(1), - channel_widget, + channel_widget, # TODO: channel only when mode is master or adhoc VSpacing(0.2), bitrate_widget, VSpacing(0.2), - access_point_widget, + access_point_widget, # TODO: Access point only in managed mode VSpacing(0.2), - Left(ap_scan_mode_widget), + Left(ap_scan_mode_widget), # TODO: AP scan mode only in managed mode VSpacing(1) ), HSpacing(2) diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index cf024ce5f..071eb5271 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/dialog" require "cwm/custom_widget" require "cwm/common_widgets" @@ -6,7 +25,7 @@ module Y2Network module Dialogs # Dialog to manage WEP keys class WirelessWepKeys < CWM::Dialog - # @param builder [Y2network::InterfaceConfigBuilder] + # @param builder [InterfaceConfigBuilder] def initialize(builder) textdomain "network" @builder = builder @@ -65,11 +84,13 @@ def initialize(builder) @builder = builder end + ITEMS = [ + ["64", "64"], + ["128", "128"] + ].freeze + def items - [ - ["64", "64"], - ["128", "128"] - ] + ITEMS end def init @@ -135,25 +156,28 @@ def init refresh_table end - def refresh_table + def refresh_table(selected_index) table_items = @settings.keys.each_with_index.map do |key, i| next unless key Item(Id(i), i.to_s, key, i == @settings.default_key ? "X" : "") end + compact_keys = @settings.keys.compact + Yast::UI.ChangeWidget(Id(:wep_keys_table), :Items, table_items.compact) [:wep_keys_delete, :wep_keys_edit, :wep_keys_default].each do |k| Yast::UI.ChangeWidget( Id(k), :Enabled, - !@settings.keys.compact.empty? + !compact_keys.empty? ) end Yast::UI.ChangeWidget( Id(:wep_keys_add), :Enabled, - @settings.keys.compact.size < 4 # only 4 keys are possible + compact_keys.size < 4 # only 4 keys are possible ) + Yast::UI.ChangeWidget(Id(:wep_keys_table), :CurrentItem, selected_index) end # @return [Symbol, nil] dialog result @@ -166,8 +190,7 @@ def handle(event) key = dialog(@settings.keys[cur]) if key @settings.keys[cur] = key - refresh_table - Yast::UI.ChangeWidget(Id(:wep_keys_table), :CurrentItem, cur) + refresh_table(cur) end when :wep_keys_add key = dialog @@ -180,20 +203,14 @@ def handle(event) @settings.keys << key end log.info "new keys #{@settings.keys.inspect}" - refresh_table - Yast::UI.ChangeWidget( - Id(:wep_keys_table), - :CurrentItem, - @settings.keys.compact.size - 1 - ) + refresh_table(@settings.keys.compact.size - 1) end when :wep_keys_delete @settings.keys.delete_at(cur) - refresh_table + refresh_table(0) when :wep_keys_default @settings.default_key = cur - refresh_table - Yast::UI.ChangeWidget(Id(:wep_keys_table), :CurrentItem, cur) + refresh_table(cur) end nil @@ -223,18 +240,15 @@ def dialog(value = nil) val = nil while (ret = Yast::UI.UserInput) == :ok val = Yast::UI.QueryWidget(Id(:key), :Value) - if !valid_key(val) - # Popup::Error text - Yast::Popup.Error( - _( - "The WEP key is not valid. WEP key can be specified either directly in hex " \ - "digits, with or without dashes, or in the key's ASCII representation " \ - "(prefix s: ), or as a passphrase which will be hashed (prefix h: )." - ) + break if valid_key?(val) + # Popup::Error text + Yast::Popup.Error( + _( + "The WEP key is not valid. WEP key can be specified either directly in hex " \ + "digits, with or without dashes, or in the key's ASCII representation " \ + "(prefix s: ), or as a passphrase which will be hashed (prefix h: )." ) - next - end - break + ) end Yast::UI.CloseDialog @@ -243,7 +257,7 @@ def dialog(value = nil) val end - def valid_key(_key) + def valid_key?(_key) # TODO: write validation true end diff --git a/src/lib/y2network/widgets/additional_addresses.rb b/src/lib/y2network/widgets/additional_addresses.rb index da3890dba..1e88a52e9 100644 --- a/src/lib/y2network/widgets/additional_addresses.rb +++ b/src/lib/y2network/widgets/additional_addresses.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/custom_widget" diff --git a/src/lib/y2network/widgets/address_tab.rb b/src/lib/y2network/widgets/address_tab.rb index 9c643bd2f..b71923c82 100644 --- a/src/lib/y2network/widgets/address_tab.rb +++ b/src/lib/y2network/widgets/address_tab.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/tabs" diff --git a/src/lib/y2network/widgets/blink_button.rb b/src/lib/y2network/widgets/blink_button.rb index 86af77002..fed03af08 100644 --- a/src/lib/y2network/widgets/blink_button.rb +++ b/src/lib/y2network/widgets/blink_button.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/custom_widget" require "y2network/widgets/slave_items" diff --git a/src/lib/y2network/widgets/bond_options.rb b/src/lib/y2network/widgets/bond_options.rb index a452cbd81..4f74282a4 100644 --- a/src/lib/y2network/widgets/bond_options.rb +++ b/src/lib/y2network/widgets/bond_options.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/bond_slave.rb b/src/lib/y2network/widgets/bond_slave.rb index 558a2d845..9250257b7 100644 --- a/src/lib/y2network/widgets/bond_slave.rb +++ b/src/lib/y2network/widgets/bond_slave.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "ui/text_helpers" require "yast" require "cwm/custom_widget" diff --git a/src/lib/y2network/widgets/bond_slaves_tab.rb b/src/lib/y2network/widgets/bond_slaves_tab.rb index e591084cb..3d4be73a0 100644 --- a/src/lib/y2network/widgets/bond_slaves_tab.rb +++ b/src/lib/y2network/widgets/bond_slaves_tab.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/tabs" diff --git a/src/lib/y2network/widgets/boot_protocol.rb b/src/lib/y2network/widgets/boot_protocol.rb index 3bcd919ed..5c143751c 100644 --- a/src/lib/y2network/widgets/boot_protocol.rb +++ b/src/lib/y2network/widgets/boot_protocol.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/custom_widget" diff --git a/src/lib/y2network/widgets/bridge_ports.rb b/src/lib/y2network/widgets/bridge_ports.rb index 7ffc43e58..3470f46d6 100644 --- a/src/lib/y2network/widgets/bridge_ports.rb +++ b/src/lib/y2network/widgets/bridge_ports.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" require "y2network/widgets/slave_items" diff --git a/src/lib/y2network/widgets/bridge_slaves_tab.rb b/src/lib/y2network/widgets/bridge_slaves_tab.rb index 884132552..74d45f80b 100644 --- a/src/lib/y2network/widgets/bridge_slaves_tab.rb +++ b/src/lib/y2network/widgets/bridge_slaves_tab.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/tabs" diff --git a/src/lib/y2network/widgets/client_cert_path.rb b/src/lib/y2network/widgets/client_cert_path.rb index 6543b67cd..6006a5197 100644 --- a/src/lib/y2network/widgets/client_cert_path.rb +++ b/src/lib/y2network/widgets/client_cert_path.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2network/widgets/path_widget" module Y2Network diff --git a/src/lib/y2network/widgets/client_key_path.rb b/src/lib/y2network/widgets/client_key_path.rb index c3eaca3d3..ccc16a25d 100644 --- a/src/lib/y2network/widgets/client_key_path.rb +++ b/src/lib/y2network/widgets/client_key_path.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2network/widgets/path_widget" module Y2Network diff --git a/src/lib/y2network/widgets/destination.rb b/src/lib/y2network/widgets/destination.rb index 06cf31691..6f4ae7779 100644 --- a/src/lib/y2network/widgets/destination.rb +++ b/src/lib/y2network/widgets/destination.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + Yast.import "IP" Yast.import "Popup" diff --git a/src/lib/y2network/widgets/devices.rb b/src/lib/y2network/widgets/devices.rb index 16094fe63..b1aef5508 100644 --- a/src/lib/y2network/widgets/devices.rb +++ b/src/lib/y2network/widgets/devices.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2network/interface" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/ethtools_options.rb b/src/lib/y2network/widgets/ethtools_options.rb index 3f8a709b0..d18123749 100644 --- a/src/lib/y2network/widgets/ethtools_options.rb +++ b/src/lib/y2network/widgets/ethtools_options.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/gateway.rb b/src/lib/y2network/widgets/gateway.rb index 0a477b4fc..8e9f87778 100644 --- a/src/lib/y2network/widgets/gateway.rb +++ b/src/lib/y2network/widgets/gateway.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + Yast.import "IP" Yast.import "Popup" Yast.import "UI" diff --git a/src/lib/y2network/widgets/general_tab.rb b/src/lib/y2network/widgets/general_tab.rb index 5ef233903..1936cb309 100644 --- a/src/lib/y2network/widgets/general_tab.rb +++ b/src/lib/y2network/widgets/general_tab.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/tabs" diff --git a/src/lib/y2network/widgets/hardware_tab.rb b/src/lib/y2network/widgets/hardware_tab.rb index 6d287863d..529db0875 100644 --- a/src/lib/y2network/widgets/hardware_tab.rb +++ b/src/lib/y2network/widgets/hardware_tab.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/tabs" diff --git a/src/lib/y2network/widgets/ifplugd_priority.rb b/src/lib/y2network/widgets/ifplugd_priority.rb index 3a03e9be4..1e0f4aacc 100644 --- a/src/lib/y2network/widgets/ifplugd_priority.rb +++ b/src/lib/y2network/widgets/ifplugd_priority.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/interface_name.rb b/src/lib/y2network/widgets/interface_name.rb index 2d7122d44..771b76f90 100644 --- a/src/lib/y2network/widgets/interface_name.rb +++ b/src/lib/y2network/widgets/interface_name.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/interface_type.rb b/src/lib/y2network/widgets/interface_type.rb index 1c13b702d..83972f391 100644 --- a/src/lib/y2network/widgets/interface_type.rb +++ b/src/lib/y2network/widgets/interface_type.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/ip4_forwarding.rb b/src/lib/y2network/widgets/ip4_forwarding.rb index 2bc08ca06..28f40015b 100644 --- a/src/lib/y2network/widgets/ip4_forwarding.rb +++ b/src/lib/y2network/widgets/ip4_forwarding.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" Yast.import "NetworkService" diff --git a/src/lib/y2network/widgets/ip6_forwarding.rb b/src/lib/y2network/widgets/ip6_forwarding.rb index b76934346..c8bee1714 100644 --- a/src/lib/y2network/widgets/ip6_forwarding.rb +++ b/src/lib/y2network/widgets/ip6_forwarding.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" Yast.import "NetworkService" diff --git a/src/lib/y2network/widgets/ip_address.rb b/src/lib/y2network/widgets/ip_address.rb index 9507b4b99..7e16ae1ad 100644 --- a/src/lib/y2network/widgets/ip_address.rb +++ b/src/lib/y2network/widgets/ip_address.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/ipoib_mode.rb b/src/lib/y2network/widgets/ipoib_mode.rb index 38d1468b8..fc1979b10 100644 --- a/src/lib/y2network/widgets/ipoib_mode.rb +++ b/src/lib/y2network/widgets/ipoib_mode.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/kernel_module.rb b/src/lib/y2network/widgets/kernel_module.rb index c9a507d79..c5ff44766 100644 --- a/src/lib/y2network/widgets/kernel_module.rb +++ b/src/lib/y2network/widgets/kernel_module.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/kernel_options.rb b/src/lib/y2network/widgets/kernel_options.rb index 2424798a3..3cf094c24 100644 --- a/src/lib/y2network/widgets/kernel_options.rb +++ b/src/lib/y2network/widgets/kernel_options.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/mtu.rb b/src/lib/y2network/widgets/mtu.rb index fbb6a9646..08e7407af 100644 --- a/src/lib/y2network/widgets/mtu.rb +++ b/src/lib/y2network/widgets/mtu.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/netmask.rb b/src/lib/y2network/widgets/netmask.rb index 1f9628b32..c3560efd4 100644 --- a/src/lib/y2network/widgets/netmask.rb +++ b/src/lib/y2network/widgets/netmask.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/path_widget.rb b/src/lib/y2network/widgets/path_widget.rb index 4eab21597..1bf76b239 100644 --- a/src/lib/y2network/widgets/path_widget.rb +++ b/src/lib/y2network/widgets/path_widget.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "abstract_method" module Y2Network diff --git a/src/lib/y2network/widgets/remote_ip.rb b/src/lib/y2network/widgets/remote_ip.rb index 43a4a3565..3fa971a44 100644 --- a/src/lib/y2network/widgets/remote_ip.rb +++ b/src/lib/y2network/widgets/remote_ip.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/common_widgets" diff --git a/src/lib/y2network/widgets/route_options.rb b/src/lib/y2network/widgets/route_options.rb index 9a26067be..fb2100cdb 100644 --- a/src/lib/y2network/widgets/route_options.rb +++ b/src/lib/y2network/widgets/route_options.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + Yast.import "Netmask" Yast.import "Label" diff --git a/src/lib/y2network/widgets/routing_buttons.rb b/src/lib/y2network/widgets/routing_buttons.rb index d05f67d61..b67b64e1e 100644 --- a/src/lib/y2network/widgets/routing_buttons.rb +++ b/src/lib/y2network/widgets/routing_buttons.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" require "y2network/dialogs/route" require "y2network/route" diff --git a/src/lib/y2network/widgets/routing_table.rb b/src/lib/y2network/widgets/routing_table.rb index 7cdf147ba..324d0775b 100644 --- a/src/lib/y2network/widgets/routing_table.rb +++ b/src/lib/y2network/widgets/routing_table.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "ipaddr" require "cwm/table" diff --git a/src/lib/y2network/widgets/s390_button.rb b/src/lib/y2network/widgets/s390_button.rb index 34f221256..6f55a8c86 100644 --- a/src/lib/y2network/widgets/s390_button.rb +++ b/src/lib/y2network/widgets/s390_button.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/server_ca_path.rb b/src/lib/y2network/widgets/server_ca_path.rb index 1adcaf53f..c3722f383 100644 --- a/src/lib/y2network/widgets/server_ca_path.rb +++ b/src/lib/y2network/widgets/server_ca_path.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2network/widgets/path_widget" module Y2Network diff --git a/src/lib/y2network/widgets/slave_items.rb b/src/lib/y2network/widgets/slave_items.rb index c251ddb23..87e7567cd 100644 --- a/src/lib/y2network/widgets/slave_items.rb +++ b/src/lib/y2network/widgets/slave_items.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" Yast.import "NetworkInterfaces" diff --git a/src/lib/y2network/widgets/startmode.rb b/src/lib/y2network/widgets/startmode.rb index 6b81dd5fb..c8b42eb3c 100644 --- a/src/lib/y2network/widgets/startmode.rb +++ b/src/lib/y2network/widgets/startmode.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" require "y2network/startmode" diff --git a/src/lib/y2network/widgets/tunnel.rb b/src/lib/y2network/widgets/tunnel.rb index 9629b139c..d4384fbf0 100644 --- a/src/lib/y2network/widgets/tunnel.rb +++ b/src/lib/y2network/widgets/tunnel.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/custom_widget" diff --git a/src/lib/y2network/widgets/udev_rules.rb b/src/lib/y2network/widgets/udev_rules.rb index 60dacef04..07065f6b3 100644 --- a/src/lib/y2network/widgets/udev_rules.rb +++ b/src/lib/y2network/widgets/udev_rules.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/custom_widget" require "network/edit_nic_name" diff --git a/src/lib/y2network/widgets/vlan_id.rb b/src/lib/y2network/widgets/vlan_id.rb index 0d4974ed1..98c2283fe 100644 --- a/src/lib/y2network/widgets/vlan_id.rb +++ b/src/lib/y2network/widgets/vlan_id.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/vlan_interface.rb b/src/lib/y2network/widgets/vlan_interface.rb index ddca8b3e0..b6131c2f0 100644 --- a/src/lib/y2network/widgets/vlan_interface.rb +++ b/src/lib/y2network/widgets/vlan_interface.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/wireless.rb b/src/lib/y2network/widgets/wireless.rb index 9253b4b00..9ce6c8534 100644 --- a/src/lib/y2network/widgets/wireless.rb +++ b/src/lib/y2network/widgets/wireless.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2network/widgets/wireless_essid" require "y2network/widgets/wireless_mode" require "y2network/dialogs/wireless_expert_settings" diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index 71230f2ca..4eb9db61c 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/custom_widget" require "cwm/replace_point" diff --git a/src/lib/y2network/widgets/wireless_auth_mode.rb b/src/lib/y2network/widgets/wireless_auth_mode.rb index ffd9bcede..e9463ebee 100644 --- a/src/lib/y2network/widgets/wireless_auth_mode.rb +++ b/src/lib/y2network/widgets/wireless_auth_mode.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb index 260908454..ca3a12629 100644 --- a/src/lib/y2network/widgets/wireless_eap.rb +++ b/src/lib/y2network/widgets/wireless_eap.rb @@ -9,7 +9,7 @@ module Y2Network module Widgets # High Level widget that allow to select kind of EAP authentication and also dynamically change - # its content according to selection + # its content according to the selection class WirelessEap < CWM::CustomWidget attr_reader :settings diff --git a/src/lib/y2network/widgets/wireless_eap_mode.rb b/src/lib/y2network/widgets/wireless_eap_mode.rb index 4705fde75..d262df1d8 100644 --- a/src/lib/y2network/widgets/wireless_eap_mode.rb +++ b/src/lib/y2network/widgets/wireless_eap_mode.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb index 0b90704e8..0f147ba5a 100644 --- a/src/lib/y2network/widgets/wireless_essid.rb +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" require "cwm/custom_widget" require "yast2/feedback" @@ -101,13 +120,7 @@ def handle private - def obtained_networks(networks) - output = "
      " - networks.map { |n| output << "
    • #{n}
      • " } - output << "
    " - output - end - + # TODO: own class and do not call directly in widget. def essid_list command = "#{link_up} && #{scan} | #{grep_and_cut_essid} | #{sort}" diff --git a/src/lib/y2network/widgets/wireless_expert.rb b/src/lib/y2network/widgets/wireless_expert.rb index 5b65b810d..09a1e26a1 100644 --- a/src/lib/y2network/widgets/wireless_expert.rb +++ b/src/lib/y2network/widgets/wireless_expert.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network @@ -29,6 +48,7 @@ def opt def items # FIXME: different protocol has different number of channels, we need to reflect it somehow + # 1..14 is number of channels available in legal range for wireless 1.upto(14).map { |c| [c.to_s, c.to_s] }.prepend(["", _("Automatic")]) end end diff --git a/src/lib/y2network/widgets/wireless_mode.rb b/src/lib/y2network/widgets/wireless_mode.rb index 79fbc2109..3a9d10dba 100644 --- a/src/lib/y2network/widgets/wireless_mode.rb +++ b/src/lib/y2network/widgets/wireless_mode.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/wireless_password.rb b/src/lib/y2network/widgets/wireless_password.rb index a4777ae91..ee93e1396 100644 --- a/src/lib/y2network/widgets/wireless_password.rb +++ b/src/lib/y2network/widgets/wireless_password.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" module Y2Network diff --git a/src/lib/y2network/widgets/wireless_tab.rb b/src/lib/y2network/widgets/wireless_tab.rb index 26c6c8395..0b75bdee1 100644 --- a/src/lib/y2network/widgets/wireless_tab.rb +++ b/src/lib/y2network/widgets/wireless_tab.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "cwm/tabs" From 7189344998a43dde09873f560f3eb5e7fa2fdf97 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 23 Aug 2019 10:09:07 +0200 Subject: [PATCH 206/471] enable license check and add all missing licenses --- Rakefile | 6 +++-- examples/connection.rb | 19 ++++++++++++++ src/include/network/lan/s390.rb | 26 ++++++++++++++----- src/include/network/lan/udev.rb | 25 +++++++++++++----- src/lib/cfa/generic_sysconfig.rb | 19 ++++++++++++++ src/lib/cfa/hosts.rb | 19 ++++++++++++++ src/lib/network/clients/inst_setup_dhcp.rb | 19 ++++++++++++++ src/lib/network/clients/network_proposal.rb | 19 ++++++++++++++ src/lib/network/clients/save_network.rb | 19 ++++++++++++++ src/lib/network/confirm_virt_proposal.rb | 19 +++++++++++++- src/lib/network/edit_nic_name.rb | 19 +++++++++++++- src/lib/network/install_inf_convertor.rb | 19 ++++++++++++++ src/lib/network/network_autoconfiguration.rb | 19 +++++++++++++- src/lib/network/network_autoyast.rb | 19 ++++++++++++++ src/lib/network/wicked.rb | 19 +++++++++++++- src/lib/y2network/dialogs/add_interface.rb | 19 ++++++++++++++ src/lib/y2network/dialogs/edit_interface.rb | 19 ++++++++++++++ src/lib/y2network/dialogs/route.rb | 19 ++++++++++++++ .../interface_config_builders/bonding.rb | 19 ++++++++++++++ .../interface_config_builders/bridge.rb | 19 ++++++++++++++ .../interface_config_builders/dummy.rb | 19 ++++++++++++++ .../interface_config_builders/infiniband.rb | 19 ++++++++++++++ .../interface_config_builders/vlan.rb | 19 ++++++++++++++ .../interface_config_builders/wireless.rb | 19 ++++++++++++++ src/lib/y2network/sequences/interface.rb | 19 ++++++++++++++ src/lib/y2network/widgets/wireless_eap.rb | 19 ++++++++++++++ src/lib/y2remote/modes/socket_based.rb | 19 ++++++++++++++ src/lib/y2remote/modes/vnc.rb | 19 ++++++++++++++ src/lib/y2remote/modes/web.rb | 19 ++++++++++++++ src/scrconf/cfg_dhcp.scr | 20 ++++++++++++++ src/scrconf/cfg_network.scr | 20 ++++++++++++++ src/scrconf/cfg_udev_persistent.scr | 20 ++++++++++++++ src/scrconf/etc_hosts.scr | 20 ++++++++++++++ src/scrconf/routes.scr | 20 ++++++++++++++ src/servers_non_y2/ag_udev_persistent | 20 ++++++++++++++ t/add-del.t | 20 ++++++++++++++ test/SCRStub.rb | 19 ++++++++++++++ test/address_test.rb | 18 +++++++++++++ test/bond_test.rb | 19 ++++++++++++++ test/bridge_test.rb | 19 ++++++++++++++ test/build_lan_overview_test.rb | 19 ++++++++++++++ test/cfa/generic_sysconfig_test.rb | 19 ++++++++++++++ test/cfa/hosts_test.rb | 19 ++++++++++++++ test/cmdline_test.rb | 19 ++++++++++++++ test/complex_test.rb | 19 ++++++++++++++ test/default_route_test.rb | 19 ++++++++++++++ test/dns_test.rb | 19 ++++++++++++++ test/host_auto_test.rb | 19 ++++++++++++++ test/host_service_test.rb | 19 ++++++++++++++ test/host_test.rb | 19 ++++++++++++++ test/inst_setup_dhcp_test.rb | 19 ++++++++++++++ test/install_inf_convertor_test.rb | 19 ++++++++++++++ test/lan_auto_test.rb | 19 ++++++++++++++ test/lan_cmdline_test.rb | 19 ++++++++++++++ test/lan_items_export_test.rb | 19 ++++++++++++++ test/lan_items_helpers_test.rb | 19 ++++++++++++++ test/lan_items_read_test.rb | 19 ++++++++++++++ test/lan_items_rollback_test.rb | 19 ++++++++++++++ test/lan_items_summary_test.rb | 19 ++++++++++++++ test/lan_test.rb | 19 ++++++++++++++ test/lan_udev_auto_test.rb | 19 ++++++++++++++ test/link_handlers_test.rb | 19 ++++++++++++++ test/netcard_probe_helper.rb | 19 ++++++++++++++ test/netcard_test.rb | 19 ++++++++++++++ test/network/edit_nic_name_test.rb | 19 ++++++++++++++ test/network_autoconfiguration_test.rb | 19 ++++++++++++++ test/network_autoyast_test.rb | 19 ++++++++++++++ test/network_proposal_test.rb | 20 ++++++++++++++ test/read_hardware_test.rb | 19 ++++++++++++++ test/routines_test.rb | 19 ++++++++++++++ test/s390_helpers_test.rb | 19 ++++++++++++++ test/save_network_test.rb | 19 ++++++++++++++ test/test_helper.rb | 19 ++++++++++++++ test/udev_test.rb | 19 ++++++++++++++ test/wicked_test.rb | 19 ++++++++++++++ test/wireless_test.rb | 19 ++++++++++++++ .../interface_config_builder_test.rb | 19 ++++++++++++++ .../interface_config_builders/bonding_test.rb | 19 ++++++++++++++ .../interface_config_builders/bridge_test.rb | 19 ++++++++++++++ .../infiniband_test.rb | 19 ++++++++++++++ .../interface_config_builders/vlan_test.rb | 19 ++++++++++++++ test/y2network/proposal_settings_test.rb | 19 ++++++++++++++ test/y2network/widgets/firewall_zone_test.rb | 19 ++++++++++++++ test/yaml_defaults_test.rb | 19 ++++++++++++++ 84 files changed, 1583 insertions(+), 20 deletions(-) diff --git a/Rakefile b/Rakefile index f7c02bac4..7eebc5df4 100644 --- a/Rakefile +++ b/Rakefile @@ -1,8 +1,10 @@ require "yast/rake" Yast::Tasks.configuration do |conf| - # lets ignore license check for now - conf.skip_license_check << /.*/ + conf.skip_license_check << /doc\// + conf.skip_license_check << /test\/data/ + conf.skip_license_check << /\.desktop$/ + conf.skip_license_check << /\.rnc$/ # ensure we are not getting worse with documentation conf.documentation_minimal = 61 if conf.respond_to?(:documentation_minimal=) end diff --git a/examples/connection.rb b/examples/connection.rb index f82ee9e7d..75009be9a 100644 --- a/examples/connection.rb +++ b/examples/connection.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "y2network/config" require "y2network/virtual_interface" diff --git a/src/include/network/lan/s390.rb b/src/include/network/lan/s390.rb index 7a3be4645..c20edc579 100644 --- a/src/include/network/lan/s390.rb +++ b/src/include/network/lan/s390.rb @@ -1,12 +1,24 @@ -# encoding: utf-8 - -# File: include/network/lan/s390.ycp -# Package: Network configuration -# Summary: Network card adresss configuration dialogs -# Authors: Michal Filka +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. # -# Functions for accessing and handling s390 specific needs. +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + module Yast + # Functions for accessing and handling s390 specific needs. module NetworkLanS390Include SYS_DIR = "/sys/class/net".freeze diff --git a/src/include/network/lan/udev.rb b/src/include/network/lan/udev.rb index 820cbd258..fb6015db3 100644 --- a/src/include/network/lan/udev.rb +++ b/src/include/network/lan/udev.rb @@ -1,13 +1,24 @@ -# encoding: utf-8 - -# File: include/network/lan/udev.ycp -# Package: Network configuration -# Summary: udev helpers -# Authors: Michal Filka +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. # -# Functions for handling udev rules +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. module Yast + # Functions for handling udev rules module NetworkLanUdevInclude # Creates default udev rule for given NIC. # diff --git a/src/lib/cfa/generic_sysconfig.rb b/src/lib/cfa/generic_sysconfig.rb index 4f5c34762..1cf893c76 100644 --- a/src/lib/cfa/generic_sysconfig.rb +++ b/src/lib/cfa/generic_sysconfig.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cfa/base_model" require "cfa/augeas_parser" require "cfa/matcher" diff --git a/src/lib/cfa/hosts.rb b/src/lib/cfa/hosts.rb index acd65e483..ece5d39a5 100644 --- a/src/lib/cfa/hosts.rb +++ b/src/lib/cfa/hosts.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "yast2/target_file" diff --git a/src/lib/network/clients/inst_setup_dhcp.rb b/src/lib/network/clients/inst_setup_dhcp.rb index 86e84725b..ba5edb5ca 100644 --- a/src/lib/network/clients/inst_setup_dhcp.rb +++ b/src/lib/network/clients/inst_setup_dhcp.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "network/network_autoconfiguration" Yast.import "Linuxrc" diff --git a/src/lib/network/clients/network_proposal.rb b/src/lib/network/clients/network_proposal.rb index fb807a059..8f9e9238d 100644 --- a/src/lib/network/clients/network_proposal.rb +++ b/src/lib/network/clients/network_proposal.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cgi" require "installation/proposal_client" require "y2network/proposal_settings" diff --git a/src/lib/network/clients/save_network.rb b/src/lib/network/clients/save_network.rb index f8e392bbb..9c838124d 100644 --- a/src/lib/network/clients/save_network.rb +++ b/src/lib/network/clients/save_network.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2storage" require "network/install_inf_convertor" require "network/network_autoconfiguration" diff --git a/src/lib/network/confirm_virt_proposal.rb b/src/lib/network/confirm_virt_proposal.rb index 02ffae4e0..06f0df6f0 100644 --- a/src/lib/network/confirm_virt_proposal.rb +++ b/src/lib/network/confirm_virt_proposal.rb @@ -1,4 +1,21 @@ -# encoding: utf-8 +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. require "yast" diff --git a/src/lib/network/edit_nic_name.rb b/src/lib/network/edit_nic_name.rb index 56d30c94f..b97263220 100644 --- a/src/lib/network/edit_nic_name.rb +++ b/src/lib/network/edit_nic_name.rb @@ -1,4 +1,21 @@ -# encoding: utf-8 +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. require "yast" diff --git a/src/lib/network/install_inf_convertor.rb b/src/lib/network/install_inf_convertor.rb index ddd44502e..f251691fb 100644 --- a/src/lib/network/install_inf_convertor.rb +++ b/src/lib/network/install_inf_convertor.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "uri" diff --git a/src/lib/network/network_autoconfiguration.rb b/src/lib/network/network_autoconfiguration.rb index 114b10e0b..22568c87d 100644 --- a/src/lib/network/network_autoconfiguration.rb +++ b/src/lib/network/network_autoconfiguration.rb @@ -1,4 +1,21 @@ -# encoding: utf-8 +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. require "yast" require "network/wicked" diff --git a/src/lib/network/network_autoyast.rb b/src/lib/network/network_autoyast.rb index 38f4866fe..78aa28175 100644 --- a/src/lib/network/network_autoyast.rb +++ b/src/lib/network/network_autoyast.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" module Yast diff --git a/src/lib/network/wicked.rb b/src/lib/network/wicked.rb index 9b3d8a4b2..1b8b1ff66 100644 --- a/src/lib/network/wicked.rb +++ b/src/lib/network/wicked.rb @@ -1,4 +1,21 @@ -# encoding: utf-8 +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. require "yast" require "shellwords" diff --git a/src/lib/y2network/dialogs/add_interface.rb b/src/lib/y2network/dialogs/add_interface.rb index 277449531..83050b2d9 100644 --- a/src/lib/y2network/dialogs/add_interface.rb +++ b/src/lib/y2network/dialogs/add_interface.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/dialog" require "y2network/widgets/interface_type" require "y2network/interface_config_builder" diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index 1cced01c1..d3944cfe4 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/dialog" require "y2network/widgets/address_tab.rb" diff --git a/src/lib/y2network/dialogs/route.rb b/src/lib/y2network/dialogs/route.rb index 76edc2ceb..277475099 100644 --- a/src/lib/y2network/dialogs/route.rb +++ b/src/lib/y2network/dialogs/route.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "ipaddr" require "cwm/popup" diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 35a996405..a6421b38b 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "y2network/config" require "y2network/interface_config_builder" diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index ca4ca0a67..c914b8dc2 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "y2network/config" require "y2network/interface_config_builder" diff --git a/src/lib/y2network/interface_config_builders/dummy.rb b/src/lib/y2network/interface_config_builders/dummy.rb index 323e0d9b4..407473bed 100644 --- a/src/lib/y2network/interface_config_builders/dummy.rb +++ b/src/lib/y2network/interface_config_builders/dummy.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "y2network/interface_config_builder" diff --git a/src/lib/y2network/interface_config_builders/infiniband.rb b/src/lib/y2network/interface_config_builders/infiniband.rb index a1a147b8a..be4863a07 100644 --- a/src/lib/y2network/interface_config_builders/infiniband.rb +++ b/src/lib/y2network/interface_config_builders/infiniband.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "y2network/interface_config_builder" diff --git a/src/lib/y2network/interface_config_builders/vlan.rb b/src/lib/y2network/interface_config_builders/vlan.rb index e5285b783..936b03b58 100644 --- a/src/lib/y2network/interface_config_builders/vlan.rb +++ b/src/lib/y2network/interface_config_builders/vlan.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "y2network/interface_config_builder" diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index e0dcf1691..edb4a1c51 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "forwardable" require "y2network/config" diff --git a/src/lib/y2network/sequences/interface.rb b/src/lib/y2network/sequences/interface.rb index 250bd3584..885695aa6 100644 --- a/src/lib/y2network/sequences/interface.rb +++ b/src/lib/y2network/sequences/interface.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" module Y2Network diff --git a/src/lib/y2network/widgets/wireless_eap.rb b/src/lib/y2network/widgets/wireless_eap.rb index ca3a12629..646c937d6 100644 --- a/src/lib/y2network/widgets/wireless_eap.rb +++ b/src/lib/y2network/widgets/wireless_eap.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/custom_widget" require "cwm/replace_point" diff --git a/src/lib/y2remote/modes/socket_based.rb b/src/lib/y2remote/modes/socket_based.rb index 1a3d0f36a..ad4df20ec 100644 --- a/src/lib/y2remote/modes/socket_based.rb +++ b/src/lib/y2remote/modes/socket_based.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "yast2/systemd/socket" diff --git a/src/lib/y2remote/modes/vnc.rb b/src/lib/y2remote/modes/vnc.rb index 209a937af..cd8cd30ec 100644 --- a/src/lib/y2remote/modes/vnc.rb +++ b/src/lib/y2remote/modes/vnc.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2remote/modes/base" require "y2remote/modes/socket_based" diff --git a/src/lib/y2remote/modes/web.rb b/src/lib/y2remote/modes/web.rb index 1af164cf4..5c3138ab8 100644 --- a/src/lib/y2remote/modes/web.rb +++ b/src/lib/y2remote/modes/web.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "y2remote/modes/base" require "y2remote/modes/socket_based" diff --git a/src/scrconf/cfg_dhcp.scr b/src/scrconf/cfg_dhcp.scr index 2118eb06b..69cd0c9f2 100644 --- a/src/scrconf/cfg_dhcp.scr +++ b/src/scrconf/cfg_dhcp.scr @@ -1,3 +1,23 @@ +/** Copyright (c) [2019] SUSE LLC + * + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, contact SUSE LLC. + * + * To contact SUSE LLC about this file by physical or electronic mail, you may + * find current contact information at www.suse.com. + */ + /** * File: cfg_dhcp.scr * Summary: Agent for reading/writing /etc/sysconfig/network/dhcp diff --git a/src/scrconf/cfg_network.scr b/src/scrconf/cfg_network.scr index 90a941ae8..11e81a73c 100644 --- a/src/scrconf/cfg_network.scr +++ b/src/scrconf/cfg_network.scr @@ -1,3 +1,23 @@ +/** Copyright (c) [2019] SUSE LLC + * + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, contact SUSE LLC. + * + * To contact SUSE LLC about this file by physical or electronic mail, you may + * find current contact information at www.suse.com. + */ + /** * File: cfg_network.scr * Summary: Agent for reading/writing /etc/sysconfig/network/config diff --git a/src/scrconf/cfg_udev_persistent.scr b/src/scrconf/cfg_udev_persistent.scr index 822378322..885873f69 100644 --- a/src/scrconf/cfg_udev_persistent.scr +++ b/src/scrconf/cfg_udev_persistent.scr @@ -1,3 +1,23 @@ +/** Copyright (c) [2019] SUSE LLC + * + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, contact SUSE LLC. + * + * To contact SUSE LLC about this file by physical or electronic mail, you may + * find current contact information at www.suse.com. + */ + /** * File: * tty.scr diff --git a/src/scrconf/etc_hosts.scr b/src/scrconf/etc_hosts.scr index b29533f65..4f0165272 100644 --- a/src/scrconf/etc_hosts.scr +++ b/src/scrconf/etc_hosts.scr @@ -1,3 +1,23 @@ +/** Copyright (c) [2019] SUSE LLC + * + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, contact SUSE LLC. + * + * To contact SUSE LLC about this file by physical or electronic mail, you may + * find current contact information at www.suse.com. + */ + /** * File: etc_hosts.scr * Summary: Agent for reading/writing /etc/hosts diff --git a/src/scrconf/routes.scr b/src/scrconf/routes.scr index 39837935b..2d59e806e 100644 --- a/src/scrconf/routes.scr +++ b/src/scrconf/routes.scr @@ -1,3 +1,23 @@ +/** Copyright (c) [2019] SUSE LLC + * + * All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, contact SUSE LLC. + * + * To contact SUSE LLC about this file by physical or electronic mail, you may + * find current contact information at www.suse.com. + */ + /** * File: routes.scr * Summary: Agent for /etc/sysconfig/network/routes diff --git a/src/servers_non_y2/ag_udev_persistent b/src/servers_non_y2/ag_udev_persistent index 726932118..ba5739a07 100755 --- a/src/servers_non_y2/ag_udev_persistent +++ b/src/servers_non_y2/ag_udev_persistent @@ -1,4 +1,24 @@ #!/usr/bin/perl -w + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + package ag_udev_persistent; BEGIN { push( @INC, '/usr/share/YaST2/modules/' ); } use ycp; diff --git a/t/add-del.t b/t/add-del.t index b896b4b72..b0453dcd5 100755 --- a/t/add-del.t +++ b/t/add-del.t @@ -1,4 +1,24 @@ #!/bin/sh + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + # a TAP compatible test # quick and dirty: fail early diff --git a/test/SCRStub.rb b/test/SCRStub.rb index 5705327e3..f99f5c78f 100644 --- a/test/SCRStub.rb +++ b/test/SCRStub.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yaml" # Helpers for stubbing several agent operations. diff --git a/test/address_test.rb b/test/address_test.rb index b4117e7b4..11cc4dfdb 100755 --- a/test/address_test.rb +++ b/test/address_test.rb @@ -1,4 +1,22 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. require_relative "test_helper" diff --git a/test/bond_test.rb b/test/bond_test.rb index 05dad7050..1526b0d26 100755 --- a/test/bond_test.rb +++ b/test/bond_test.rb @@ -1,5 +1,24 @@ #! /usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/bridge_test.rb b/test/bridge_test.rb index cc19ba252..38f304c6d 100755 --- a/test/bridge_test.rb +++ b/test/bridge_test.rb @@ -1,5 +1,24 @@ #! /usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/build_lan_overview_test.rb b/test/build_lan_overview_test.rb index 310e36ce1..ad8148543 100755 --- a/test/build_lan_overview_test.rb +++ b/test/build_lan_overview_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/cfa/generic_sysconfig_test.rb b/test/cfa/generic_sysconfig_test.rb index ede684fae..15ff12dec 100644 --- a/test/cfa/generic_sysconfig_test.rb +++ b/test/cfa/generic_sysconfig_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../test_helper" require "cfa/generic_sysconfig" require "cfa/memory_file" diff --git a/test/cfa/hosts_test.rb b/test/cfa/hosts_test.rb index 2428bc19e..508e86ac0 100755 --- a/test/cfa/hosts_test.rb +++ b/test/cfa/hosts_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../test_helper" require "cfa/hosts" require "cfa/memory_file" diff --git a/test/cmdline_test.rb b/test/cmdline_test.rb index 6bec86e99..3a24367b6 100644 --- a/test/cmdline_test.rb +++ b/test/cmdline_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" class DummyClass < Yast::Module diff --git a/test/complex_test.rb b/test/complex_test.rb index ffd020782..df0d1abdc 100755 --- a/test/complex_test.rb +++ b/test/complex_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/default_route_test.rb b/test/default_route_test.rb index 651d42db0..09d16b662 100755 --- a/test/default_route_test.rb +++ b/test/default_route_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "network/install_inf_convertor" diff --git a/test/dns_test.rb b/test/dns_test.rb index 139ed246c..d92ccdeb8 100755 --- a/test/dns_test.rb +++ b/test/dns_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/host_auto_test.rb b/test/host_auto_test.rb index 70510aeec..6d5ba9d6f 100755 --- a/test/host_auto_test.rb +++ b/test/host_auto_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/host_service_test.rb b/test/host_service_test.rb index 555bfbc89..7778acbce 100755 --- a/test/host_service_test.rb +++ b/test/host_service_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" Yast.import "UI" diff --git a/test/host_test.rb b/test/host_test.rb index 3a6cd5a40..e48f1f47c 100755 --- a/test/host_test.rb +++ b/test/host_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/inst_setup_dhcp_test.rb b/test/inst_setup_dhcp_test.rb index a93262e66..19f55405d 100755 --- a/test/inst_setup_dhcp_test.rb +++ b/test/inst_setup_dhcp_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "network/clients/inst_setup_dhcp" diff --git a/test/install_inf_convertor_test.rb b/test/install_inf_convertor_test.rb index 9c1701705..14fe180b7 100755 --- a/test/install_inf_convertor_test.rb +++ b/test/install_inf_convertor_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/lan_auto_test.rb b/test/lan_auto_test.rb index 11955d8f7..1fbe05433 100755 --- a/test/lan_auto_test.rb +++ b/test/lan_auto_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/lan_cmdline_test.rb b/test/lan_cmdline_test.rb index 041369173..33d2e54fa 100644 --- a/test/lan_cmdline_test.rb +++ b/test/lan_cmdline_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" Yast.import "Report" diff --git a/test/lan_items_export_test.rb b/test/lan_items_export_test.rb index d537cc9a6..3a081226c 100755 --- a/test/lan_items_export_test.rb +++ b/test/lan_items_export_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/lan_items_helpers_test.rb b/test/lan_items_helpers_test.rb index e29633ad8..b03e0bd04 100755 --- a/test/lan_items_helpers_test.rb +++ b/test/lan_items_helpers_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/lan_items_read_test.rb b/test/lan_items_read_test.rb index f6684c0d9..77b1735bf 100755 --- a/test/lan_items_read_test.rb +++ b/test/lan_items_read_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/lan_items_rollback_test.rb b/test/lan_items_rollback_test.rb index 1444a2f8e..24296e8d6 100755 --- a/test/lan_items_rollback_test.rb +++ b/test/lan_items_rollback_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/lan_items_summary_test.rb b/test/lan_items_summary_test.rb index a4d85d637..59fccf487 100755 --- a/test/lan_items_summary_test.rb +++ b/test/lan_items_summary_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "network/lan_items_summary" diff --git a/test/lan_test.rb b/test/lan_test.rb index 980ea0ab0..6e7e57f68 100755 --- a/test/lan_test.rb +++ b/test/lan_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/lan_udev_auto_test.rb b/test/lan_udev_auto_test.rb index c3e7f2ff7..be461ae45 100755 --- a/test/lan_udev_auto_test.rb +++ b/test/lan_udev_auto_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/link_handlers_test.rb b/test/link_handlers_test.rb index 932904405..30f8ea41a 100755 --- a/test/link_handlers_test.rb +++ b/test/link_handlers_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/netcard_probe_helper.rb b/test/netcard_probe_helper.rb index 2b463a7a2..7df6eb515 100644 --- a/test/netcard_probe_helper.rb +++ b/test/netcard_probe_helper.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + def probe_netcard [ { diff --git a/test/netcard_test.rb b/test/netcard_test.rb index 2f5f7083c..822a22ace 100755 --- a/test/netcard_test.rb +++ b/test/netcard_test.rb @@ -1,5 +1,24 @@ #! /usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" HWINFO_DEVICE_DESC = "Intel Ethernet controller".freeze diff --git a/test/network/edit_nic_name_test.rb b/test/network/edit_nic_name_test.rb index c7744b8af..1e842e6a4 100755 --- a/test/network/edit_nic_name_test.rb +++ b/test/network/edit_nic_name_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../test_helper" require "yast" diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 3fa88164d..589dd27a5 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/network_autoyast_test.rb b/test/network_autoyast_test.rb index 7794438b6..dd7585cff 100755 --- a/test/network_autoyast_test.rb +++ b/test/network_autoyast_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "network/network_autoyast" diff --git a/test/network_proposal_test.rb b/test/network_proposal_test.rb index aee2b416c..603eb8dd3 100755 --- a/test/network_proposal_test.rb +++ b/test/network_proposal_test.rb @@ -1,4 +1,24 @@ #!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "network/clients/network_proposal" diff --git a/test/read_hardware_test.rb b/test/read_hardware_test.rb index 4f69ed2f4..a0cebaa4d 100755 --- a/test/read_hardware_test.rb +++ b/test/read_hardware_test.rb @@ -1,5 +1,24 @@ #! /usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/routines_test.rb b/test/routines_test.rb index c4e27a3b1..77e50d9c6 100755 --- a/test/routines_test.rb +++ b/test/routines_test.rb @@ -1,5 +1,24 @@ #! /usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/s390_helpers_test.rb b/test/s390_helpers_test.rb index f6c1e6105..56e2f3703 100755 --- a/test/s390_helpers_test.rb +++ b/test/s390_helpers_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/save_network_test.rb b/test/save_network_test.rb index 5bd0cee26..d1dc2c105 100644 --- a/test/save_network_test.rb +++ b/test/save_network_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "y2storage" diff --git a/test/test_helper.rb b/test/test_helper.rb index 248346124..5fbf05853 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + srcdir = File.expand_path("../../src", __FILE__) y2dirs = ENV.fetch("Y2DIR", "").split(":") ENV["Y2DIR"] = y2dirs.unshift(srcdir).join(":") diff --git a/test/udev_test.rb b/test/udev_test.rb index f2368c411..be68667b4 100755 --- a/test/udev_test.rb +++ b/test/udev_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/wicked_test.rb b/test/wicked_test.rb index 5d359eb62..b505f4548 100644 --- a/test/wicked_test.rb +++ b/test/wicked_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/wireless_test.rb b/test/wireless_test.rb index ea6cecd1d..e33271dea 100755 --- a/test/wireless_test.rb +++ b/test/wireless_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index b5eaa9e2d..74f389ed0 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../test_helper" require "yast" diff --git a/test/y2network/interface_config_builders/bonding_test.rb b/test/y2network/interface_config_builders/bonding_test.rb index 5c8653490..af2459c77 100644 --- a/test/y2network/interface_config_builders/bonding_test.rb +++ b/test/y2network/interface_config_builders/bonding_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../../test_helper" require "yast" diff --git a/test/y2network/interface_config_builders/bridge_test.rb b/test/y2network/interface_config_builders/bridge_test.rb index c04edbf1a..2affe77b0 100644 --- a/test/y2network/interface_config_builders/bridge_test.rb +++ b/test/y2network/interface_config_builders/bridge_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../../test_helper" require "yast" diff --git a/test/y2network/interface_config_builders/infiniband_test.rb b/test/y2network/interface_config_builders/infiniband_test.rb index 0c95c0df2..bc0abd401 100644 --- a/test/y2network/interface_config_builders/infiniband_test.rb +++ b/test/y2network/interface_config_builders/infiniband_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../../test_helper" require "yast" diff --git a/test/y2network/interface_config_builders/vlan_test.rb b/test/y2network/interface_config_builders/vlan_test.rb index eb20b1abc..3ea2ec02f 100644 --- a/test/y2network/interface_config_builders/vlan_test.rb +++ b/test/y2network/interface_config_builders/vlan_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../../test_helper" require "yast" diff --git a/test/y2network/proposal_settings_test.rb b/test/y2network/proposal_settings_test.rb index 61a0d6a91..376a71b47 100755 --- a/test/y2network/proposal_settings_test.rb +++ b/test/y2network/proposal_settings_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../test_helper" require "y2network/proposal_settings" diff --git a/test/y2network/widgets/firewall_zone_test.rb b/test/y2network/widgets/firewall_zone_test.rb index 0273e6a2b..0693793b0 100755 --- a/test/y2network/widgets/firewall_zone_test.rb +++ b/test/y2network/widgets/firewall_zone_test.rb @@ -1,5 +1,24 @@ #!/usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "../../test_helper.rb" require "y2network/widgets/firewall_zone" require "y2network/interface_config_builder" diff --git a/test/yaml_defaults_test.rb b/test/yaml_defaults_test.rb index 627565de2..271e151b3 100755 --- a/test/yaml_defaults_test.rb +++ b/test/yaml_defaults_test.rb @@ -1,5 +1,24 @@ #! /usr/bin/env rspec +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require_relative "test_helper" require "yast" From cf98817c47b00cf7c48b2978740ecbe0c8a3d1e2 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 23 Aug 2019 15:39:55 +0200 Subject: [PATCH 207/471] add test for wep widgets --- .../dialogs/wireless_wep_keys_test.rb | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/test/y2network/dialogs/wireless_wep_keys_test.rb b/test/y2network/dialogs/wireless_wep_keys_test.rb index 5f187529f..0f83ece61 100644 --- a/test/y2network/dialogs/wireless_wep_keys_test.rb +++ b/test/y2network/dialogs/wireless_wep_keys_test.rb @@ -28,3 +28,33 @@ include_examples "CWM::Dialog" end + +describe Y2Network::Dialogs::WirelessWepKeys::WEPKeyLength do + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("wlan")) } + + include_examples "CWM::ComboBox" +end + +describe Y2Network::Dialogs::WirelessWepKeys::WEPKeys do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("wlan") } + subject { described_class.new(builder) } + + include_examples "CWM::CustomWidget" + + describe "#handle" do + it "opens wep key dialog for edit button" do + builder.keys = ["test"] + expect(Yast::UI).to receive(:UserInput).and_return(:cancel) + + subject.handle("EventReason" => "Activated", "ID" => :wep_keys_edit) + end + + it "opens wep key dialog for add button" do + expect(Yast::UI).to receive(:UserInput).and_return(:cancel) + + subject.handle("EventReason" => "Activated", "ID" => :wep_keys_add) + end + end +end + + From 11136e72854a5dfdc65e479900601c94507b0bbd Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 23 Aug 2019 16:54:16 +0200 Subject: [PATCH 208/471] fix problems found during manual testing of wifi --- src/lib/y2network/widgets/wireless_auth.rb | 2 ++ src/lib/y2network/widgets/wireless_essid.rb | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/wireless_auth.rb b/src/lib/y2network/widgets/wireless_auth.rb index 4eb9db61c..23558695f 100644 --- a/src/lib/y2network/widgets/wireless_auth.rb +++ b/src/lib/y2network/widgets/wireless_auth.rb @@ -40,6 +40,8 @@ def initialize(settings) end def init + auth_mode_widget.init # force init of auth to ensure that refresh has correct value + replace_widget.init refresh end diff --git a/src/lib/y2network/widgets/wireless_essid.rb b/src/lib/y2network/widgets/wireless_essid.rb index 0f147ba5a..a20353042 100644 --- a/src/lib/y2network/widgets/wireless_essid.rb +++ b/src/lib/y2network/widgets/wireless_essid.rb @@ -67,8 +67,8 @@ def label end def init - self.value = @settings.essid.to_s Yast::UI.ChangeWidget(Id(widget_id), :ValidChars, valid_chars) + self.value = @settings.essid.to_s end # allow to use not found name e.g. when scan failed or when network is hidden @@ -84,6 +84,10 @@ def update_essid_list(networks) self.value = old_value end + def store + @settings.essid = value + end + private def valid_chars From 5178c3504aad147e5fca1491ad0dead796e02f46 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 23 Aug 2019 17:07:39 +0200 Subject: [PATCH 209/471] make rubocop happy --- test/y2network/dialogs/wireless_wep_keys_test.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/y2network/dialogs/wireless_wep_keys_test.rb b/test/y2network/dialogs/wireless_wep_keys_test.rb index 0f83ece61..659786751 100644 --- a/test/y2network/dialogs/wireless_wep_keys_test.rb +++ b/test/y2network/dialogs/wireless_wep_keys_test.rb @@ -56,5 +56,3 @@ end end end - - From cb95df2529c40664be14d2bb576baf6f780560d7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 26 Aug 2019 09:21:00 +0200 Subject: [PATCH 210/471] fix crashes in wep dialog --- src/lib/y2network/dialogs/wireless_wep_keys.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index 071eb5271..0ca3c4cbb 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -153,10 +153,11 @@ def contents # TODO: help text which explain format of WEP keys def init - refresh_table + refresh_table(0) end def refresh_table(selected_index) + @settings.keys ||= [] # TODO: should be fixed by proper initialize of settings object table_items = @settings.keys.each_with_index.map do |key, i| next unless key Item(Id(i), i.to_s, key, i == @settings.default_key ? "X" : "") From 97c3675450d3f239f431ee663afce698234e6e58 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 26 Aug 2019 13:16:11 +0200 Subject: [PATCH 211/471] WEP dialog modify directly keys, so do not allow non working abort and cancel button there --- src/lib/y2network/dialogs/wireless_wep_keys.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/lib/y2network/dialogs/wireless_wep_keys.rb b/src/lib/y2network/dialogs/wireless_wep_keys.rb index 0ca3c4cbb..4b16c56f7 100644 --- a/src/lib/y2network/dialogs/wireless_wep_keys.rb +++ b/src/lib/y2network/dialogs/wireless_wep_keys.rb @@ -17,10 +17,14 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "yast" + require "cwm/dialog" require "cwm/custom_widget" require "cwm/common_widgets" +Yast.import "Label" + module Y2Network module Dialogs # Dialog to manage WEP keys @@ -77,6 +81,20 @@ def should_open_dialog? true end + # Omits abort + def abort_button + "" + end + + # Omits back button, only let OK be. So it do directly modification + def back_button + "" + end + + def next_button + Yast::Label.OKButton + end + class WEPKeyLength < CWM::ComboBox def initialize(builder) textdomain "network" From 0b40e701abad9d02c81e863f92ed555b4bdd847a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 26 Aug 2019 16:00:37 +0200 Subject: [PATCH 212/471] drop old backend --- .../y2network/connection_config/infiniband.rb | 7 + src/lib/y2network/connection_config/vlan.rb | 1 + src/lib/y2network/interface_config_builder.rb | 261 ++---------------- .../interface_config_builders/bonding.rb | 35 +-- .../interface_config_builders/bridge.rb | 13 +- .../interface_config_builders/dummy.rb | 11 - .../interface_config_builders/infiniband.rb | 27 +- .../interface_config_builders/vlan.rb | 9 +- .../interface_config_builders/wireless.rb | 60 +--- src/modules/LanItems.rb | 199 +------------ 10 files changed, 73 insertions(+), 550 deletions(-) diff --git a/src/lib/y2network/connection_config/infiniband.rb b/src/lib/y2network/connection_config/infiniband.rb index 7e3ad1e85..4b5dea47d 100644 --- a/src/lib/y2network/connection_config/infiniband.rb +++ b/src/lib/y2network/connection_config/infiniband.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "y2network/connection_config/base" +require "y2network/ipoib_mode" module Y2Network module ConnectionConfig @@ -27,6 +28,12 @@ module ConnectionConfig class Infiniband < Base # @return [IpoibMode] transport mode attr_accessor :ipoib_mode + + def initialize + super + + self.ipoib_mode = IpoibMode::DEFAULT + end end end end diff --git a/src/lib/y2network/connection_config/vlan.rb b/src/lib/y2network/connection_config/vlan.rb index dbad8146e..596e1a1e8 100644 --- a/src/lib/y2network/connection_config/vlan.rb +++ b/src/lib/y2network/connection_config/vlan.rb @@ -25,6 +25,7 @@ module ConnectionConfig class Vlan < Base # FIXME: By now it will be just the interface name although in NM it # could be a ifname, UUID or even a MAC address. + # TODO: consider using Interface instead of plain string? # # @return [String] the real interface associated with the vlan attr_accessor :parent_device diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 3ef278e87..6ca12daad 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -28,7 +28,6 @@ Yast.import "LanItems" Yast.import "NetworkInterfaces" -Yast.import "Netmask" module Y2Network # Collects data from the UI until we have enough of it to create a @@ -58,6 +57,8 @@ def self.for(type, config: nil) attr_accessor :name # @return [Y2Network::InterfaceType] type of @see Y2Network::Interface which is intended to be build attr_accessor :type + # @return [Y2Network::ConnectionConfig] connection config on which builder operates + attr_reader :connection_config # Constructor # @@ -67,17 +68,19 @@ def self.for(type, config: nil) # for newly created def initialize(type:, config: nil) @type = type - @config = init_device_config({}) - @s390_config = init_device_s390_config({}) # TODO: also config need to store it, as newly added can be later # edited with option for not yet created interface @newly_added = config.nil? - # TODO: create specialized connection for type - @connection_config = config || connection_config_klass(type).new + if config + @connection_config = config + else + # TODO: propose new defaults + connection_config_klass(type).new + end end def newly_added? - Yast::LanItems.operation == :add + @newly_added end # saves builder content to backend @@ -85,8 +88,8 @@ def newly_added? # down, so here mainly workarounds, but ideally this save should change # completely backend def save - Yast::LanItems.Items[Yast::LanItems.current]["ifcfg"] = name if !driver.empty? + # TODO: new backend? Yast::LanItems.setDriver(driver) Yast::LanItems.driver_options[driver] = driver_options end @@ -99,13 +102,12 @@ def save # create new instance as name can change firewall_interface = Y2Firewall::Firewalld::Interface.new(name) if Y2Firewall::Firewalld.instance.installed? + # TODO: New backend? Yast::LanItems.firewall_zone = firewall_zone # TODO: should change only if different, but maybe firewall_interface responsibility? firewall_interface.zone = firewall_zone if !firewall_interface.zone || firewall_zone != firewall_interface.zone.name end - save_aliases - nil end @@ -150,6 +152,7 @@ def interface # do not modify anything # @return [Array] def proposed_names + # TODO: new backend? Yast::LanItems.new_type_devices(type.short_name, NEW_DEVICES_COUNT) end @@ -161,6 +164,7 @@ def valid_name?(name) # checks if interface name already exists def name_exists?(name) + # TODO: new backend Yast::NetworkInterfaces.List("").include?(name) end @@ -172,6 +176,7 @@ def name_valid_characters # gets a list of available kernel modules for the interface def kernel_modules + # TODO: new backend? Yast::LanItems.GetItemModules("") end @@ -191,51 +196,31 @@ def firewall_zone=(value) # @return [Y2Network::BootProtocol] def boot_protocol - select_backend( - Y2Network::BootProtocol.from_name(@config["BOOTPROTO"]), - @connection_config.bootproto - ) + @connection_config.bootproto end # @param[String, Y2Network::BootProtocol] def boot_protocol=(value) value = value.name if value.is_a?(Y2Network::BootProtocol) - @config["BOOTPROTO"] = value @connection_config.bootproto = Y2Network::BootProtocol.from_name(value) end # @return [Startmode] def startmode - # in future use only @connection_config and just delegate method - startmode = Startmode.create(@config["STARTMODE"]) - return nil unless startmode - - startmode.priority = @config["IFPLUGD_PRIORITY"] if startmode.name == "ifplugd" - select_backend( - startmode, - @connection_config.startmode - ) + @connection_config.startmode end # @param [String,Y2Network::Startmode] name startmode name used to create Startmode object # or object itself def startmode=(name) - mode = name.is_a?(Startmode) ? name : Startmode.create(name) - if !mode # invalid startmode e.g. in CLI - @config["STARTMODE"] = "" - return - end - # assign only if it is not already this value. This helps with ordering of ifplugd_priority if !@connection_config.startmode || @connection_config.startmode.name != mode.name @connection_config.startmode = mode end - @config["STARTMODE"] = mode.name end # @param [Integer] value priority value def ifplugd_priority=(value) - @config["IFPLUGD_PRIORITY"] = value.to_s if !@connection_config.startmode || @connection_config.startmode.name != "ifplugd" @connection_config.startmode = Startmode.create("ifplugd") end @@ -244,21 +229,18 @@ def ifplugd_priority=(value) # @return [Integer] def ifplugd_priority - # in future use only @connection_config and just delegate method - startmode = @connection_config.startmode - select_backend( - @config["IFPLUGD_PRIORITY"].to_i, - startmode.name == "ifplugd" ? startmode.priority : 0 - ) + startmode.name == "ifplugd" ? startmode.priority : 0 end # gets currently assigned kernel module def driver + # TODO: new backend @driver ||= Yast::Ops.get_string(Yast::LanItems.getCurrentItem, ["udev", "driver"], "") end # sets kernel module for interface def driver=(value) + # TODO: new backend @driver = value end @@ -266,11 +248,13 @@ def driver=(value) def driver_options target_driver = @driver target_driver = hwinfo.module if target_driver.empty? + # TODO: new backend @driver_options ||= Yast::LanItems.driver_options[target_driver] || "" end # sets specific options for kernel driver def driver_options=(value) + # TODO: new backend @driver_options = value end @@ -281,16 +265,7 @@ def driver_options=(value) def aliases return @aliases if @aliases - old_aliases = Yast::LanItems.aliases.each_value.map do |data| - { - label: data["LABEL"] || "", - ip: data["IPADDR"] || "", - mask: data["NETMASK"] || "", - prefixlen: data["PREFIXLEN"] || "" - } - end - - new_aliases = @connection_config.ip_aliases.map do |data| + aliases = @connection_config.ip_aliases.map do |data| { label: data.label.to_s, ip: data.address.address.to_s, @@ -298,7 +273,7 @@ def aliases # NOTE: new API does not have netmask at all, we need to adapt UI to clearly mention only prefix } end - @aliases = select_backend(old_aliases, new_aliases) + @aliases = aliases end # sets aliases for interface @@ -309,6 +284,7 @@ def aliases=(value) # gets interface name that will be assigned by udev def udev_name + # TODO: change to new way of renaming interface. Imo? # cannot cache as EditNicName dialog can change it Yast::LanItems.current_udev_name end @@ -326,20 +302,16 @@ def ethtool_options=(value) # @return [String] def ip_address - old = @config["IPADDR"] - default = @connection_config.ip - new_ = if default + if default default.address.address.to_s else "" end - select_backend(old, new_) end # @param [String] value def ip_address=(value) - @config["IPADDR"] = value if value.nil? || value.empty? @connection_config.ip = nil else @@ -349,34 +321,22 @@ def ip_address=(value) # @return [String] returns prefix or netmask. prefix in format "/" def subnet_prefix - old = if @config["PREFIXLEN"] && !@config["PREFIXLEN"].empty? - "/#{@config["PREFIXLEN"]}" - else - @config["NETMASK"] || "" - end - new_ = if @connection_config.ip + if @connection_config.ip "/" + @connection_config.ip.address.prefix.to_s else "" end - select_backend(old, new_) end # @param [String] value prefix or netmask is accepted. prefix in format "/" def subnet_prefix=(value) if value.empty? - @config["PREFIXLEN"] = "" - @config["NETMASK"] = "" ip_config_default.address.prefix = nil elsif value.start_with?("/") - @config["PREFIXLEN"] = value[1..-1] ip_config_default.address.prefix = value[1..-1].to_i elsif value.size < 3 # one or two digits can be only prefixlen - @config["PREFIXLEN"] = value ip_config_default.address.prefix = value.to_i else - param = Yast::Netmask.Check6(value) ? "PREFIXLEN" : "NETMASK" - @config[param] = value if param == "PREFIXLEN" ip_config_default.address.prefix = value.to_i else @@ -398,37 +358,28 @@ def hostname=(value) # sets remote ip for ptp connections # @return [String] def remote_ip - old = @config["REMOTEIP"] default = @connection_config.ip new_ = if default default.remote_address.to_s else "" end - - select_backend(old, new_) end # @param [String] value def remote_ip=(value) - @config["REMOTEIP"] = value ip_config_default.remote_address = IPAddress.from_string(value) end # Gets Maximum Transition Unit # @return [String] def mtu - select_backend( - @config["MTU"], - @connection_config.mtu.to_s - ) + @connection_config.mtu.to_s end # Sets Maximum Transition Unit # @param [String] value def mtu=(value) - @config["MTU"] = value - @connection_config.mtu = value.to_i end @@ -442,175 +393,17 @@ def assign_tunnel_user_group(user, group) @config["TUNNEL_SET_GROUP"] = group end - # Provides stored configuration in sysconfig format - # - # @return [Hash] where key is sysconfig option and value is the option's value - def device_sysconfig - # initalize options which has to be known and was not set by the user explicitly - init_mandatory_options - - # with naive implementation of filtering options by type - config = @config.dup - - # filter out options which are not needed - config.delete_if { |k, _| k =~ /WIRELESS.*/ } if type != InterfaceType::WIRELESS - config.delete_if { |k, _| k =~ /BONDING.*/ } if type != InterfaceType::BONDING - config.delete_if { |k, _| k =~ /BRIDGE.*/ } if type != InterfaceType::BRIDGE - if ![InterfaceType::TUN, InterfaceType::TAP].include?(type) - config.delete_if { |k, _| k =~ /TUNNEL.*/ } - end - config.delete_if { |k, _| k == "VLAN_ID" || k == "ETHERDEVICE" } if type != InterfaceType::VLAN - config.delete_if { |k, _| k == "IPOIB_MODE" } if type != InterfaceType::INFINIBAND - config.delete_if { |k, _| k == "INTERFACE" } if type != InterfaceType::DUMMY - config.delete_if { |k, _| k == "IFPLUGD_PRIORITY" } if config["STARTMODE"] != "ifplugd" - - config.merge("_aliases" => lan_items_format_aliases) - end - - # Updates itself according to the given sysconfig configuration - # - # @param devmap [Hash, nil] a key, value map where key is sysconfig option - # and corresponding value is the option value - def load_sysconfig(devmap) - @config.merge!(devmap || {}) - end - - def load_s390_config(devmap) - @s390_config.merge!(devmap || {}) - end - private - # Initializes device configuration map with default values when needed - # - # @param devmap [Hash] current device configuration - # - # @return device configuration map where unspecified values were set - # to reasonable defaults - def init_device_config(devmap) - # the defaults here are what sysconfig defaults to - # (as opposed to what a new interface gets, in {#Select)} - defaults = YAML.load_file(Yast::Directory.find_data_file("network/sysconfig_defaults.yml")) - defaults.merge(devmap) - end - - def init_device_s390_config(devmap) - Yast.import "Arch" - - return {} if !Yast::Arch.s390 - - # Default values used when creating an emulated NIC for physical s390 hardware. - s390_defaults = YAML.load_file(Yast::Directory.find_data_file("network/s390_defaults.yml")) - s390_defaults.merge(devmap) - end - - # returns a map with device options for newly created item - def init_mandatory_options - # FIXME: NetHwDetection is done in Lan.Read - Yast.import "NetHwDetection" - - # #104494 - always write IPADDR+NETMASK, even empty - # #50955 omit computable fields - @config["BROADCAST"] = "" - @config["NETWORK"] = "" - - if !@config["NETMASK"] || @config["NETMASK"].empty? - @config["NETMASK"] = Yast::NetHwDetection.result["NETMASK"] || "255.255.255.0" - end - - @config["STARTMODE"] = new_device_startmode if !@config["STARTMODE"] || @config["STARTMODE"].empty? - end - - # returns default startmode for a new device - # - # startmode is returned according product, Arch and current device type - def new_device_startmode - Yast.import "ProductFeatures" - - product_startmode = Yast::ProductFeatures.GetStringFeature( - "network", - "startmode" - ) - - startmode = case product_startmode - when "ifplugd" - if replace_ifplugd? - hotplug_interface? ? "hotplug" : "auto" - else - product_startmode - end - when "auto" - "auto" - else - hotplug_interface? ? "hotplug" : "auto" - end - - startmode - end - - def replace_ifplugd? - Yast.import "Arch" - Yast.import "NetworkService" - - return true if !Yast::Arch.is_laptop - return true if Yast::NetworkService.is_network_manager - # virtual devices cannot expect any event from ifplugd - return true if ["bond", "vlan", "br"].include? type.short_name - - false - end - - def hotplug_interface? - hwinfo.hotplug - end - def hwinfo @hwinfo ||= Hwinfo.new(name: name) end - def lan_items_format_aliases - aliases.each_with_index.each_with_object({}) do |(a, i), res| - res[i] = { - "IPADDR" => a[:ip], - "LABEL" => a[:label], - "PREFIXLEN" => a[:prefixlen], - "NETMASK" => a[:mask] - - } - end - end - - def save_aliases - log.info "setting new aliases #{lan_items_format_aliases.inspect}" - aliases_to_delete = Yast::LanItems.aliases.dup # #48191 - Yast::NetworkInterfaces.Current["_aliases"] = lan_items_format_aliases - Yast::LanItems.aliases = lan_items_format_aliases - aliases_to_delete.each_pair do |a, v| - Yast::NetworkInterfaces.DeleteAlias(Yast::NetworkInterfaces.Name, a) if v - end - save_aliases_to_connection - end - def ip_config_default return @connection_config.ip if @connection_config.ip @connection_config.ip = ConnectionConfig::IPConfig.new(IPAddress.new("0.0.0.0")) end - # method that allows easy change of backend for providing data - # it also logs error if result differs - # TODO: Only temporary method for testing switch of backends. Remove it from production - # - # @param old_value [Object] - # @param new_value [Object] - def select_backend(old_value, new_value) - if new_value != old_value - log.error "Different value in backends. Old: #{old_value.inspect} New: #{new_value.inspect}" - end - - # XXX: to be removed when fully migrated to the new backend - ENV["Y2NETWORK_NEW_BACKEND"] == "1" ? new_value : old_value - end - # Returns the connection config class for a given type # # @param type [Y2Network::InterfaceType] type of device diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index a6421b38b..812b02c4f 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -25,12 +25,11 @@ module Y2Network module InterfaceConfigBuilders class Bonding < InterfaceConfigBuilder include Yast::Logger + extend Forwardable def initialize(config: nil) super(type: InterfaceType::BONDING, config: config) - # fill mandatory bond option - @slaves = [] end # @return [Array] list of interfaces usable for the bond device @@ -38,33 +37,17 @@ def bondable_interfaces interfaces.all.select { |i| bondable?(i) } end - # @return [String] options for bonding - attr_writer :bond_options - # current options for bonding - def bond_options - return @bond_options if @bond_options - - @bond_options = Yast::LanItems.bond_option - if @bond_options.nil? || @bond_options.empty? - @bond_options = @config["BONDING_MODULE_OPTS"] - end - @bond_options - end + def_delegators :connection_config, + :slaves, :slaves= - def slaves - @slaves + # @param value [String] options for bonding + def bond_options= (value) + connection_config.options = value end - def slaves=(value) - @slaves = value - end - - # (see Y2Network::InterfaceConfigBuilder#save) - def save - super - - Yast::LanItems.bond_slaves = @slaves - Yast::LanItems.bond_option = bond_options + # current options for bonding + def bond_options + connection_config.options end private diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index c914b8dc2..809bfb795 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "yast" +require "forwardable" require "y2network/config" require "y2network/interface_config_builder" @@ -27,6 +28,7 @@ module Y2Network module InterfaceConfigBuilders class Bridge < InterfaceConfigBuilder include Yast::Logger + extend Forwardable def initialize(config: nil) super(type: InterfaceType::BRIDGE, config: config) @@ -45,15 +47,8 @@ def bridgeable_interfaces interfaces.all.select { |i| bridgeable?(i) } end - # @return [Array] - def ports - @config["BRIDGE_PORTS"].split - end - - # @param [Array] value - def ports=(value) - @config["BRIDGE_PORTS"] = value.join(" ") - end + def_delegators :@connection_config, + :ports, :ports= private diff --git a/src/lib/y2network/interface_config_builders/dummy.rb b/src/lib/y2network/interface_config_builders/dummy.rb index 407473bed..0d960388b 100644 --- a/src/lib/y2network/interface_config_builders/dummy.rb +++ b/src/lib/y2network/interface_config_builders/dummy.rb @@ -26,17 +26,6 @@ class Dummy < InterfaceConfigBuilder def initialize(config: nil) super(type: InterfaceType::DUMMY, config: config) end - - # (see Y2Network::InterfaceConfigBuilder#save) - # - # In case of config builder for dummy interface type it gurantees that - # the interface will be recognized as dummy one by the backend properly. - # @return [void] - def save - super - - @config["INTERFACETYPE"] = "dummy" - end end end end diff --git a/src/lib/y2network/interface_config_builders/infiniband.rb b/src/lib/y2network/interface_config_builders/infiniband.rb index be4863a07..46878a931 100644 --- a/src/lib/y2network/interface_config_builders/infiniband.rb +++ b/src/lib/y2network/interface_config_builders/infiniband.rb @@ -19,8 +19,7 @@ require "yast" require "y2network/interface_config_builder" - -Yast.import "LanItems" +require "y2network/ipoib_mode" module Y2Network module InterfaceConfigBuilders @@ -29,31 +28,21 @@ def initialize(config: nil) super(type: InterfaceType::INFINIBAND, config: config) end - # @return [String] ipoib mode configuration - attr_writer :ipoib_mode + # @param value [String] ipoib mode configuration + def ipoib_mode=(value) + connection_config.ipoib_mode = IpoibMode.from_name(value) + end # Returns current value of infiniband mode # # @return [String] particular mode or "default" when not set def ipoib_mode - @ipoib_mode ||= if [nil, ""].include?(@config["IPOIB_MODE"]) - "default" + case connection_config.ipoib_mode.name + when "" then "default" else - @config["IPOIB_MODE"] + connection_config.ipoib_mode.name end end - - # (see Y2Network::InterfaceConfigBuilder#save) - # - # In case of config builder for Ib interface type it sets infiniband's - # mode to reasonable default when not set explicitly. - def save - super - - @config["IPOIB_MODE"] = ipoib_mode == "default" ? nil : ipoib_mode - - nil - end end end end diff --git a/src/lib/y2network/interface_config_builders/vlan.rb b/src/lib/y2network/interface_config_builders/vlan.rb index 936b03b58..590ad4d8d 100644 --- a/src/lib/y2network/interface_config_builders/vlan.rb +++ b/src/lib/y2network/interface_config_builders/vlan.rb @@ -32,22 +32,22 @@ def initialize(config: nil) # @return [Integer] def vlan_id - (@config["VLAN_ID"] || "0").to_i + connection_config.vlan_id || 0 end # @param [Integer] value def vlan_id=(value) - @config["VLAN_ID"] = value.to_s + connection_config.vlan_id = value end # @return [String] def etherdevice - @config["ETHERDEVICE"] + connection_config.parent_device end # @param [String] value def etherdevice=(value) - @config["ETHERDEVICE"] = value + connection_config.parent_device = value end # @return [Hash] returns ordered list of devices that can be used for vlan @@ -55,6 +55,7 @@ def etherdevice=(value) def possible_vlans res = {} # unconfigured devices + # TODO: new backend Yast::LanItems.Items.each_value do |lan_item| next unless (lan_item["ifcfg"] || "").empty? dev_name = lan_item.fetch("hwinfo", {}).fetch("dev_name", "") diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index edb4a1c51..5776188fc 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -25,6 +25,7 @@ module Y2Network module InterfaceConfigBuilders # Builder for wireless configuration. Many methods delegated to ConnectionConfig::Wireless + # @see ConnectionConfig::Wireless class Wireless < InterfaceConfigBuilder extend Forwardable include Yast::Logger @@ -33,72 +34,23 @@ def initialize(config: nil) super(type: InterfaceType::WIRELESS, config: config) end - def mode - select_backend( - @config["WIRELESS_MODE"], - @connection_config.mode - ) - end - - def mode=(mode) - @config["WIRELESS_MODE"] = mode - @connection_config.mode = mode - end - - def essid - select_backend( - @config["WIRELESS_ESSID"], - @connection_config.essid - ) - end - - def essid=(value) - @config["WIRELESS_ESSID"] = value - @connection_config.essid = value - end - def auth_modes Yast::LanItems.wl_auth_modes end - def auth_mode - select_backend( - @config["WIRELESS_AUTH_MODE"], - @connection_config.auth_mode - ) - end - - def auth_mode=(mode) - @config["WIRELESS_AUTH_MODE"] = mode - @connection_config.auth_mode = mode - end - - def eap_mode - select_backend( - @config["WPA_EAP_MODE"], - @connection_config.eap_mode - ) - end - - def eap_mode=(mode) - @config["WIRELESS_EAP_MODE"] = mode - @connection_config.eap_mode = mode - end - def access_point - select_backend( - @config["WIRELESS_AP"], - @connection_config.ap - ) + @connection_config.ap end def access_point=(value) - @config["WIRELESS_AP"] = value @connection_config.ap = value end - # TODO: select backend? probably not needed as we will merge it when new backend will be already ready def_delegators :@connection_config, + :auth_mode, :auth_mode=, + :eap_mode, :eap_mode=, + :mode, :mode=, + :essid, :essid=, :wpa_psk, :wpa_psk=, :wpa_password, :wpa_password=, :wpa_identity, :wpa_identity=, diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 0aaca0c98..682c8341b 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1004,30 +1004,9 @@ def ReadHw def Read reset_cache - ReadHw() - NetworkInterfaces.Read - NetworkInterfaces.adapt_old_config! - NetworkInterfaces.CleanHotplugSymlink - - interfaces = getNetworkInterfaces - items = LanItems.Items - # match configurations to Items list with hwinfo - interfaces.each do |confname| - items.each do |key, value| - match = value.fetch("hwinfo", {}).fetch("dev_name", "") == confname - items[key]["ifcfg"] = confname if match - end - end - - interfaces.each do |confname| - next if items.values.any? { |item| item && item["ifcfg"] == confname } - - items[items.size] = { "ifcfg" => confname } - end - - log.info "Read Configuration LanItems::Items #{@Items}" - - nil + system_config = Y2Network::Config.from(:sysconfig) + Yast::Lan.add_config(:system, system_config) + Yast::Lan.add_config(:yast, system_config.copy) end # Clears internal cache of the module to default values @@ -1713,125 +1692,10 @@ def setup_bonding(devmap, slaves, options) # # @return true if success def Commit(builder) - if @operation != :add && @operation != :edit - log.error("Unknown operation: #{@operation}") - raise ArgumentError, "Unknown operation: #{@operation}" - end - log.info "committing builder #{builder.inspect}" builder.save # does all modification, later only things that is not yet converted - # FIXME: most of the following stuff should be moved into InterfaceConfigBuilder - # when generating sysconfig configuration - newdev = builder.device_sysconfig - - # #50955 omit computable fields - newdev["BROADCAST"] = "" - newdev["NETWORK"] = "" - - # set LLADDR to sysconfig only for device on layer2 and only these which needs it - # do not write incorrect LLADDR. - # FIXME: s390 - broken in network-ng - if @qeth_layer2 && s390_correct_lladdr(@qeth_macaddress) - busid = Ops.get_string(@Items, [@current, "hwinfo", "busid"], "") - # sysfs id has changed from css0... - sysfs_id = "/devices/qeth/#{busid}" - log.info("busid #{busid}") - if s390_device_needs_persistent_mac(sysfs_id, @Hardware) - newdev["LLADDR"] = @qeth_macaddress - end - end - - newdev = setup_dhclient_options(newdev) - - # FIXME: network-ng currently works for eth only - case builder.type.short_name - when "bond" - # we need current slaves - when some of them is not used anymore we need to - # configure it for deletion from ifcfg (SCR expects special value nil) - current_slaves = (GetCurrentMap() || {}).select { |k, _| k.start_with?("BONDING_SLAVE") } - newdev = setup_bonding(newdev.merge(current_slaves), @bond_slaves, builder.bond_options) - - when "wlan" - newdev["WIRELESS_MODE"] = @wl_mode - newdev["WIRELESS_ESSID"] = @wl_essid - newdev["WIRELESS_NWID"] = @wl_nwid - newdev["WIRELESS_AUTH_MODE"] = @wl_auth_mode - newdev["WIRELESS_WPA_PSK"] = @wl_wpa_psk - newdev["WIRELESS_KEY_LENGTH"] = @wl_key_length - # obsoleted by WIRELESS_KEY_0 - newdev["WIRELESS_KEY"] = "" # TODO: delete the varlable - newdev["WIRELESS_KEY_0"] = Ops.get(@wl_key, 0, "") - newdev["WIRELESS_KEY_1"] = Ops.get(@wl_key, 1, "") - newdev["WIRELESS_KEY_2"] = Ops.get(@wl_key, 2, "") - newdev["WIRELESS_KEY_3"] = Ops.get(@wl_key, 3, "") - Ops.set( - newdev, - "WIRELESS_DEFAULT_KEY", - Builtins.tostring(@wl_default_key) - ) - Ops.set(newdev, "WIRELESS_NICK", @wl_nick) - Ops.set(newdev, "WIRELESS_AP_SCANMODE", @wl_ap_scanmode) - - if @wl_wpa_eap != {} - Ops.set( - newdev, - "WIRELESS_EAP_MODE", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_MODE", "") - ) - Ops.set( - newdev, - "WIRELESS_WPA_IDENTITY", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_IDENTITY", "") - ) - Ops.set( - newdev, - "WIRELESS_WPA_PASSWORD", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_PASSWORD", "") - ) - Ops.set( - newdev, - "WIRELESS_WPA_ANONID", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_ANONID", "") - ) - Ops.set( - newdev, - "WIRELESS_CLIENT_CERT", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_CERT", "") - ) - Ops.set( - newdev, - "WIRELESS_CLIENT_KEY", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_KEY", "") - ) - Ops.set( - newdev, - "WIRELESS_CLIENT_KEY_PASSWORD", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_CLIENT_KEY_PASSWORD", "") - ) - Ops.set( - newdev, - "WIRELESS_CA_CERT", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_CA_CERT", "") - ) - Ops.set( - newdev, - "WIRELESS_EAP_AUTH", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_AUTH", "") - ) - Ops.set( - newdev, - "WIRELESS_PEAP_VERSION", - Ops.get_string(@wl_wpa_eap, "WPA_EAP_PEAP_VERSION", "") - ) - end - - newdev["WIRELESS_CHANNEL"] = @wl_channel - newdev["WIRELESS_FREQUENCY"] = @wl_frequency - newdev["WIRELESS_BITRATE"] = @wl_bitrate - newdev["WIRELESS_AP"] = @wl_accesspoint - newdev["WIRELESS_POWER"] = @wl_power ? "yes" : "no" - end + # TODO: still needed? if DriverType(builder.type.short_name) == "ctc" if Ops.get(NetworkConfig.Config, "WAIT_FOR_INTERFACES").nil? || Ops.less_than( @@ -1842,37 +1706,8 @@ def Commit(builder) end end - # ZONE uses an empty string as the default ZONE which means that is not - # the same than not defining the attribute - current_map = (GetCurrentMap() || {}).select { |k, v| !v.nil? && (k == "ZONE" || !v.empty?) } - # FIXME: move to config builder (might depend on some proposals above) - new_map = newdev.select { |k, v| !v.nil? && (k == "ZONE" || !v.empty?) } - - log.info "current map #{current_map.inspect}" - log.info "new map #{newdev.inspect}" - - # CanonicalizeIP is called to get new device map into the same shape as - # NetworkInterfaces provides the current one. - if current_map != NetworkInterfaces.CanonicalizeIP(new_map) - keep_existing = false - ifcfg_name = builder.name - ifcfg_name.replace("") if !NetworkInterfaces.Change2(ifcfg_name, newdev, keep_existing) - - # bnc#752464 - can leak wireless passwords - # useful only for debugging. Writes huge struct mostly filled by defaults. - Builtins.y2debug("%1", NetworkInterfaces.ConcealSecrets1(newdev)) - - # configure bridge ports - if builder.type.bridge? - bridge_ports = builder.ports - log.info "Configuring bridge ports #{bridge_ports} for: #{ifcfg_name}" - bridge_ports.each { |bp| configure_as_bridge_port(bp) } - end - - SetModified() - end - - @operation = nil + # TODO: is it still needed? + SetModified() true end @@ -1935,28 +1770,6 @@ def DeleteItem end def SetItem(builder:) - @operation = :edit - @device = Ops.get_string(getCurrentItem, "ifcfg", "") - - NetworkInterfaces.Edit(@device) - @type = Ops.get_string(getCurrentItem, ["hwinfo", "type"], "") - - @type = NetworkInterfaces.GetType(@device) if @type.empty? - - # general stuff - devmap = deep_copy(NetworkInterfaces.Current) - s390_devmap = s390_ReadQethConfig( - Ops.get_string(getCurrentItem, ["hwinfo", "dev_name"], "") - ) - - @description = BuildDescription(@type, @device, devmap, @Hardware) - - devmap = SetDeviceVars(devmap, @SysconfigDefaults) - s390_devmap = SetS390Vars(s390_devmap, @s390_defaults) - - builder.load_sysconfig(devmap) - builder.load_s390_config(s390_devmap) - @hotplug = "" Builtins.y2debug("type=%1", @type) if Builtins.issubstring(@type, "-") From f600b8a54c170de875f5dbfc5d440bb3d656b900 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 26 Aug 2019 16:16:30 +0200 Subject: [PATCH 213/471] clean unused methods --- src/modules/LanItems.rb | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 682c8341b..0db3aea34 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1647,43 +1647,6 @@ def Select(dev) true end - TRISTATE_TO_S = { nil => nil, false => "no", true => "yes" }.freeze - - # Sets device map items related to dhclient - def setup_dhclient_options(devmap) - if dhcp?(devmap) - val = TRISTATE_TO_S.fetch(@set_default_route) - devmap["DHCLIENT_SET_DEFAULT_ROUTE"] = val if val - end - devmap - end - - # Sets bonding specific sysconfig options in given device map - # - # If any bonding specific option is present already it gets overwritten - # by new ones in case of collision. If any BONDING_SLAVEx from devmap - # is not set, then its value is set to 'nil' - # - # @param devmap [Hash] hash of a device's sysconfig variables - # @param slaves [array] list of strings, each string is a bond slave name - # - # @return [Hash] updated copy of the device map - def setup_bonding(devmap, slaves, options) - raise ArgumentError, "Device map has to be provided." if devmap.nil? - - devmap = deep_copy(devmap) - slaves ||= [] - - slave_opts = devmap.select { |k, _| k.start_with?("BONDING_SLAVE") }.keys - slave_opts.each { |s| devmap[s] = nil } - slaves.each_with_index { |s, i| devmap["BONDING_SLAVE#{i}"] = s } - - devmap["BONDING_MODULE_OPTS"] = options || "" - devmap["BONDING_MASTER"] = "yes" - - devmap - end - # Commit pending operation # # It commits *only* content of the corresponding ifcfg into NetworkInterfaces. From 6eb3581c6380f63ad7e0a39c1de1c694d366b81d Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 27 Aug 2019 09:48:50 +0200 Subject: [PATCH 214/471] rubocop and fix endless loop --- src/lib/y2network/interface_config_builder.rb | 17 ++++++++--------- .../interface_config_builders/bonding.rb | 3 +-- .../y2network/sysconfig/interfaces_reader.rb | 2 +- src/modules/Lan.rb | 1 + src/modules/LanItems.rb | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 6ca12daad..8461eeae4 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -213,10 +213,11 @@ def startmode # @param [String,Y2Network::Startmode] name startmode name used to create Startmode object # or object itself def startmode=(name) + mode = name.is_a?(Startmode) ? name : Startmode.create(name) # assign only if it is not already this value. This helps with ordering of ifplugd_priority - if !@connection_config.startmode || @connection_config.startmode.name != mode.name - @connection_config.startmode = mode - end + return if @connection_config.startmode && @connection_config.startmode.name == mode.name + + @connection_config.startmode = mode end # @param [Integer] value priority value @@ -336,12 +337,10 @@ def subnet_prefix=(value) ip_config_default.address.prefix = value[1..-1].to_i elsif value.size < 3 # one or two digits can be only prefixlen ip_config_default.address.prefix = value.to_i + elsif param == "PREFIXLEN" + ip_config_default.address.prefix = value.to_i else - if param == "PREFIXLEN" - ip_config_default.address.prefix = value.to_i - else - ip_config_default.address.netmask = value - end + ip_config_default.address.netmask = value end end @@ -359,7 +358,7 @@ def hostname=(value) # @return [String] def remote_ip default = @connection_config.ip - new_ = if default + if default default.remote_address.to_s else "" diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 812b02c4f..26826b4c4 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -29,7 +29,6 @@ class Bonding < InterfaceConfigBuilder def initialize(config: nil) super(type: InterfaceType::BONDING, config: config) - end # @return [Array] list of interfaces usable for the bond device @@ -41,7 +40,7 @@ def bondable_interfaces :slaves, :slaves= # @param value [String] options for bonding - def bond_options= (value) + def bond_options=(value) connection_config.options = value end diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index cc35bc378..8fe9ae4c9 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -90,7 +90,7 @@ def find_physical_interfaces # @return [Array] Hardware information def hardware Yast::LanItems.Hardware unless Yast::LanItems.Hardware.empty? - Yast::LanItems.Read # try again if no hardware was found + Yast::LanItems.ReadHw # try again if no hardware was found Yast::LanItems.Hardware end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 965fadd19..aaea8662f 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -35,6 +35,7 @@ require "y2firewall/firewalld" require "y2network/autoinst_profile/networking_section" require "y2network/config" +require "y2network/interface_config_builder" require "y2network/presenters/routing_summary" require "y2network/presenters/dns_summary" diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 0db3aea34..f0f659ee0 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1732,7 +1732,7 @@ def DeleteItem nil end - def SetItem(builder:) + def SetItem(*) @hotplug = "" Builtins.y2debug("type=%1", @type) if Builtins.issubstring(@type, "-") From f7dcc7cb62fbbcf9aa0eeabd4bd5644cc604d8bf Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 27 Aug 2019 13:15:26 +0200 Subject: [PATCH 215/471] use new backend for tun/tap --- src/lib/y2network/interface_config_builder.rb | 10 ----- .../interface_config_builders/tap.rb | 41 +++++++++++++++++++ .../interface_config_builders/tun.rb | 41 +++++++++++++++++++ 3 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 src/lib/y2network/interface_config_builders/tap.rb create mode 100644 src/lib/y2network/interface_config_builders/tun.rb diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 8461eeae4..ac6727f7e 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -382,16 +382,6 @@ def mtu=(value) @connection_config.mtu = value.to_i end - # @return [Array(2)] user and group of tunnel - def tunnel_user_group - [@config["TUNNEL_SET_OWNER"], @config["TUNNEL_SET_GROUP"]] - end - - def assign_tunnel_user_group(user, group) - @config["TUNNEL_SET_OWNER"] = user - @config["TUNNEL_SET_GROUP"] = group - end - private def hwinfo diff --git a/src/lib/y2network/interface_config_builders/tap.rb b/src/lib/y2network/interface_config_builders/tap.rb new file mode 100644 index 000000000..322376f7d --- /dev/null +++ b/src/lib/y2network/interface_config_builders/tap.rb @@ -0,0 +1,41 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/interface_config_builder" + +module Y2Network + module InterfaceConfigBuilders + class TAP < InterfaceConfigBuilder + def initialize(config: nil) + super(type: InterfaceType::TAP, config: config) + end + + # @return [Array(2)] user and group of tunnel + def tunnel_user_group + [connection_config.owner, connection_config.group] + end + + def assign_tunnel_user_group(user, group) + connection_config.owner = user + connection_config.group = group + end + end + end +end diff --git a/src/lib/y2network/interface_config_builders/tun.rb b/src/lib/y2network/interface_config_builders/tun.rb new file mode 100644 index 000000000..f0e5c1a81 --- /dev/null +++ b/src/lib/y2network/interface_config_builders/tun.rb @@ -0,0 +1,41 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/interface_config_builder" + +module Y2Network + module InterfaceConfigBuilders + class Tun < InterfaceConfigBuilder + def initialize(config: nil) + super(type: InterfaceType::TUN, config: config) + end + + # @return [Array(2)] user and group of tunnel + def tunnel_user_group + [connection_config.owner, connection_config.group] + end + + def assign_tunnel_user_group(user, group) + connection_config.owner = user + connection_config.group = group + end + end + end +end From c49938e5f14884cd3bdc9925edc664afaf9401bb Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 27 Aug 2019 13:37:13 +0200 Subject: [PATCH 216/471] remove unused summary include --- src/include/network/complex.rb | 1 - src/include/network/lan/address.rb | 1 - src/include/network/lan/complex.rb | 1 - src/include/network/lan/hardware.rb | 1 - src/include/network/summary.rb | 53 ----------------------------- 5 files changed, 57 deletions(-) delete mode 100644 src/include/network/summary.rb diff --git a/src/include/network/complex.rb b/src/include/network/complex.rb index 09381989a..35fa47327 100644 --- a/src/include/network/complex.rb +++ b/src/include/network/complex.rb @@ -42,7 +42,6 @@ def initialize_network_complex(include_target) Yast.import "Summary" Yast.include include_target, "network/routines.rb" - Yast.include include_target, "network/summary.rb" end # Used for initializing the description variable (ifcfg[NAME]) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index 42070e00b..c0d29c69c 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -47,7 +47,6 @@ def initialize_network_lan_address(include_target) Yast.import "ProductFeatures" Yast.import "String" - Yast.include include_target, "network/summary.rb" Yast.include include_target, "network/lan/help.rb" Yast.include include_target, "network/lan/hardware.rb" Yast.include include_target, "network/complex.rb" diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index 8a433e782..f38533b86 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -54,7 +54,6 @@ def initialize_network_lan_complex(include_target) Yast.import "LanItems" Yast.include include_target, "network/routines.rb" - Yast.include include_target, "network/summary.rb" Yast.include include_target, "network/lan/help.rb" Yast.include include_target, "network/services/routing.rb" Yast.include include_target, "network/services/dns.rb" diff --git a/src/include/network/lan/hardware.rb b/src/include/network/lan/hardware.rb index f8d18ba6e..6e1bc00b9 100644 --- a/src/include/network/lan/hardware.rb +++ b/src/include/network/lan/hardware.rb @@ -44,7 +44,6 @@ def initialize_network_lan_hardware(include_target) Yast.import "Popup" Yast.import "Wizard" Yast.import "LanItems" - Yast.include include_target, "network/summary.rb" Yast.include include_target, "network/routines.rb" Yast.include include_target, "network/lan/cards.rb" diff --git a/src/include/network/summary.rb b/src/include/network/summary.rb deleted file mode 100644 index c715253ef..000000000 --- a/src/include/network/summary.rb +++ /dev/null @@ -1,53 +0,0 @@ -# encoding: utf-8 - -# *************************************************************************** -# -# Copyright (c) 2012 Novell, Inc. -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -# -# ************************************************************************** -# File: include/network/summary.ycp -# Package: Network configuration -# Summary: Summary and overview functions -# Authors: Michal Svec -# -# -# All config settings are stored in a global variable Devices. -# All hardware settings are stored in a global variable Hardware. -# Deleted devices are in the global list DELETED. -module Yast - module NetworkSummaryInclude - def initialize_network_summary(_include_target) - textdomain "network" - - Yast.import "String" - Yast.import "NetworkInterfaces" - end - - # Create list of Table items - # @param [Array] types list of types - # @param [String] cur current type - # @return Table items - def BuildTypesList(types, cur) - types = deep_copy(types) - Builtins.maplist(types) do |t| - Item(Id(t), NetworkInterfaces.GetDevTypeDescription(t, false), t == cur) - end - end - end -end From c98ca389d8045196a32efeaae3ed9b19de0917c7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 27 Aug 2019 13:40:32 +0200 Subject: [PATCH 217/471] remove no longer used method --- src/include/network/widgets.rb | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/src/include/network/widgets.rb b/src/include/network/widgets.rb index fe907ced6..a20e40b3f 100644 --- a/src/include/network/widgets.rb +++ b/src/include/network/widgets.rb @@ -208,36 +208,5 @@ def ipv6_widget "store" => fun_ref(method(:storeIPv6), "void (string, map)") } end - - def GetDeviceDescription(device_id) - device_name = NetworkInterfaces.GetValue(device_id, "NAME") - if device_name.nil? || device_name == "" - # TRANSLATORS: Informs that device name is not known - device_name = _("Unknown device") - end - Builtins.y2milestone("device_name %1", device_name) - # avoid too long device names - # if (size(device_name) > 30) { - # device_name = substring (device_name, 0, 27) + "..."; - # } - ip_addr = if Builtins.issubstring(NetworkInterfaces.GetValue(device_id, "BOOTPROTO"), "dhcp") - # TRANSLATORS: Part of label, device with IP address assigned by DHCP - _("DHCP address") - else - # TRANSLATORS: Part of label, device with static IP address - NetworkInterfaces.GetValue(device_id, "IPADDR") - end - if ip_addr.nil? || ip_addr == "" - # TRANSLATORS: Informs that no IP has been assigned to the device - ip_addr = _("No IP address assigned") - end - output = Builtins.sformat( - _("%1 \n%2 - %3"), - device_name, - NetworkInterfaces.GetDeviceTypeName(device_id), - ip_addr - ) - output - end end end From d1da347bbc73e1ba677af94ae16a7c834002f21f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 27 Aug 2019 14:42:10 +0200 Subject: [PATCH 218/471] fix rubocop --- src/lib/y2network/sysconfig/type_detector.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/type_detector.rb b/src/lib/y2network/sysconfig/type_detector.rb index c9ee8614a..f142841ee 100644 --- a/src/lib/y2network/sysconfig/type_detector.rb +++ b/src/lib/y2network/sysconfig/type_detector.rb @@ -30,7 +30,6 @@ class TypeDetector < Y2Network::TypeDetector class << self private - # Checks wheter iface type can be recognized by interface configuration def type_by_config(iface) iface_file = Y2Network::Sysconfig::InterfaceFile.find(iface) From d974bf0b4ca1b744d7626bd8a6ea5cd9765f3d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 22 Aug 2019 21:43:14 +0100 Subject: [PATCH 219/471] Hwinfo constructor will not retrieve hardware info anymore * A new Hwinfo.for method has been added for such scenarios. * Add an Hwinfo#== method. --- src/lib/y2network/hwinfo.rb | 52 +++++++++++++++++++++++----------- src/lib/y2network/interface.rb | 2 +- test/y2network/hwinfo_test.rb | 18 +++++++++++- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index 68d8674ae..950d04d93 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -25,11 +25,37 @@ module Y2Network # FIXME: decide whether it should read hwinfo (on demand or at once) for a network # device and store only necessary info or just parse provided hash class Hwinfo + # TODO: this method should be private attr_reader :hwinfo - def initialize(name:) + class << self + # Creates a new instance containing hardware information for a given interface + # + # @param name [String] Interface's name + def for(name) + new(load_hwinfo(name)) + end + + private + + def load_hwinfo(name) + hw = Yast::LanItems.Hardware.find { |h| h["dev_name"] == name } + return nil if hw.nil? + + raw_dev_port = Yast::SCR.Read( + Yast::Path.new(".target.string"), "/sys/class_net/#{name}/dev_port" + ).to_s.strip + hw["dev_port"] = raw_dev_port unless raw_dev_port.empty? + hw + end + end + + # Constructor + # + # @param hwinfo [Hash] Hardware information + def initialize(hwinfo) # FIXME: store only what's needed. - @hwinfo = load_hwinfo(name) + @hwinfo = hwinfo end # Shortcuts for accessing hwinfo items. Each hwinfo item has own method for reading @@ -112,20 +138,14 @@ def drivers modules.map { |m| Driver.new(*m) } end - private - - # for textdomain in network/hardware.rb - include Yast::I18n - - def load_hwinfo(name) - hw = Yast::LanItems.Hardware.find { |h| h["dev_name"] == name } - return nil if hw.nil? - - raw_dev_port = Yast::SCR.Read( - Yast::Path.new(".target.string"), "/sys/class_net/#{name}/dev_port" - ).to_s.strip - hw["dev_port"] = raw_dev_port unless raw_dev_port.empty? - hw + # Determines whether two objects are equivalent + # + # @param other [Hwinfo] Object to compare with + # @return [Boolean] + def ==(other) + hwinfo == other.hwinfo end + + alias_method :eql?, :== end end diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 12085c76a..9e81a4add 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -77,7 +77,7 @@ def initialize(name, type: InterfaceType::ETHERNET) @description = "" @type = type # @hardware and @name should not change during life of the object - @hardware = Hwinfo.new(name: name) + @hardware = Hwinfo.for(name) init(name) end diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 1cc6084f8..90ab09d90 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -21,7 +21,7 @@ require "y2network/hwinfo" describe Y2Network::Hwinfo do - subject(:hwinfo) { described_class.new(name: interface_name) } + subject(:hwinfo) { described_class.for(interface_name) } let(:hardware) do YAML.load_file(File.join(DATA_PATH, "hardware.yml")) @@ -82,4 +82,20 @@ end end end + + describe "#==" do + context "when both objects contain the same information" do + it "returns true" do + expect(described_class.new("dev_name" => "eth0")) + .to eq(described_class.new("dev_name" => "eth0")) + end + end + + context "when both objects contain different information" do + it "returns false" do + expect(described_class.new("dev_name" => "eth0")) + .to_not eq(described_class.new("dev_name" => "eth1")) + end + end + end end From 32adcd23b663f313d72c30814847c9d51f12eea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Sun, 25 Aug 2019 10:25:09 +0100 Subject: [PATCH 220/471] Add a widget to set an interface name --- .../widgets/custom_interface_name.rb | 88 +++++++++++++++++++ .../widgets/custom_interface_name_test.rb | 79 +++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 src/lib/y2network/widgets/custom_interface_name.rb create mode 100644 test/y2network/widgets/custom_interface_name_test.rb diff --git a/src/lib/y2network/widgets/custom_interface_name.rb b/src/lib/y2network/widgets/custom_interface_name.rb new file mode 100644 index 000000000..f8e8f898a --- /dev/null +++ b/src/lib/y2network/widgets/custom_interface_name.rb @@ -0,0 +1,88 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "cwm" +require "cwm/common_widgets" + +Yast.import "Popup" + +module Y2Network + module Widgets + class CustomInterfaceName < CWM::InputField + # Constructor + # + # @param builder [InterfaceConfigBuilder] Interface configuration builder object + def initialize(builder) + textdomain "network" + @builder = builder + @old_name = builder.name + end + + # @see CWM::AbstractWidget#label + def label + _("Device Name") + end + + # @see CWM::AbstractWidget#opt + def opt + [:hstretch] + end + + # @see CWM::AbstractWidget#init + def init + self.value = @builder.name + end + + # Saves the current value so it can be queried after the widget is closed + # @see CWM::AbstractWidget#init + def store + @value = value + end + + # Current value + # + # @return [String,nil] + def value + @value || super + end + + # The value is valid when it does not contain unexpected characters + # and it is not taken already. + # + # @return [Boolean] + # + # @see CWM::AbstractWidget#opt + # @see Y2Network::InterfaceConfigBuilder#name_exists? + # @see Y2Network::InterfaceConfigBuilder#valid_name? + def validate + if @old_name != value && @builder.name_exists?(value) + Yast::Popup.Error(_("Configuration name already exists.")) + return false + end + + if !@builder.valid_name?(value) + Yast::Popup.Error(_("Invalid configuration name.")) + return false + end + + true + end + end + end +end diff --git a/test/y2network/widgets/custom_interface_name_test.rb b/test/y2network/widgets/custom_interface_name_test.rb new file mode 100644 index 000000000..e48921592 --- /dev/null +++ b/test/y2network/widgets/custom_interface_name_test.rb @@ -0,0 +1,79 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/custom_interface_name" +require "y2network/interface_config_builder" + +describe Y2Network::Widgets::CustomInterfaceName do + subject { described_class.new(builder) } + + let(:builder) do + instance_double( + Y2Network::InterfaceConfigBuilder, + name: "eth", + valid_name?: valid_name?, + name_exists?: name_exists? + ) + end + let(:valid_name?) { true } + let(:name_exists?) { false } + + include_examples "CWM::InputField" + + describe "#validate" do + + before do + allow(builder) + end + + context "when the name is valid" do + it "returns true" do + expect(subject.validate).to eq(true) + end + end + + context "when the name contains unexpected characters" do + let(:valid_name?) { false } + + it "returns false" do + expect(subject.validate).to eq(false) + end + + it "displays an error popup" do + expect(Yast::Popup).to receive(:Error).with(/Invalid configuration/) + subject.validate + end + end + + context "when the name is already taken" do + let(:name_exists?) { true } + + it "returns false" do + expect(subject.validate).to eq(false) + end + + it "displays an error popup" do + expect(Yast::Popup).to receive(:Error).with(/already exists/) + subject.validate + end + end + end +end From 30b9ec1f351ac7e31ad6b933b130d4d850f91770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Sun, 25 Aug 2019 11:08:48 +0100 Subject: [PATCH 221/471] Improves Hwinfo class comparison --- src/lib/y2network/hwinfo.rb | 8 +++++--- test/y2network/hwinfo_test.rb | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index 950d04d93..bf4e2e6bc 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -53,9 +53,9 @@ def load_hwinfo(name) # Constructor # # @param hwinfo [Hash] Hardware information - def initialize(hwinfo) + def initialize(hwinfo = {}) # FIXME: store only what's needed. - @hwinfo = hwinfo + @hwinfo = Hash[hwinfo.map { |k, v| [k.to_s, v] }] if hwinfo end # Shortcuts for accessing hwinfo items. Each hwinfo item has own method for reading @@ -140,10 +140,12 @@ def drivers # Determines whether two objects are equivalent # + # Ignores any element having a nil value. + # # @param other [Hwinfo] Object to compare with # @return [Boolean] def ==(other) - hwinfo == other.hwinfo + hwinfo.reject { |_k, v| v.nil? } == other.hwinfo.reject { |_k, v| v.nil? } end alias_method :eql?, :== diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 90ab09d90..90b34176d 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -97,5 +97,10 @@ .to_not eq(described_class.new("dev_name" => "eth1")) end end + + it "ignores nil values" do + expect(described_class.new("dev_name" => "eth0", "other" => nil)) + .to eq(described_class.new("dev_name" => "eth0")) + end end end From d983c24a37b2ebcb6e2cb7a4ee8dd06249a6f04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Sun, 25 Aug 2019 11:09:41 +0100 Subject: [PATCH 222/471] Add a widget to select the information to rename an interface --- src/lib/y2network/widgets/rename_hwinfo.rb | 107 +++++++++++++++++++ test/y2network/widgets/rename_hwinfo_test.rb | 77 +++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 src/lib/y2network/widgets/rename_hwinfo.rb create mode 100644 test/y2network/widgets/rename_hwinfo_test.rb diff --git a/src/lib/y2network/widgets/rename_hwinfo.rb b/src/lib/y2network/widgets/rename_hwinfo.rb new file mode 100644 index 000000000..51f3483d0 --- /dev/null +++ b/src/lib/y2network/widgets/rename_hwinfo.rb @@ -0,0 +1,107 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm" + +module Y2Network + module Widgets + # This class allows the user to select which hardware information + # should be taken into account when renaming a device + class RenameHwinfo < CWM::CustomWidget + # @return [Hwinfo,nil] Hardware information to consider + attr_reader :value + + # Constructor + # + # @param builder [InterfaceConfigBuilder] Interface configuration builder object + def initialize(builder) + textdomain "network" + @builder = builder + + interface = builder.interface + return unless interface.hardware # FIXME: handle interfaces with no hardware information + @hwinfo = interface.hardware || Y2Network::Hwinfo.new({}) + @mac = @hwinfo.mac + @bus_id = @hwinfo.busid + end + + # @see CWM::AbstractWidget + def init + udev_attr = @hwinfo.busid && !@hwinfo.busid.empty? ? :bus_id : :mac + Yast::UI.ChangeWidget(Id(:udev_type), :Value, udev_attr) + end + + # @see CWM::AbstractWidget + def store + @value = current_value + end + + # @see CWM::CustomWidget + def contents + VBox( + _("Base Udev Rule On"), + RadioButtonGroup( + Id(:udev_type), + VBox( + # make sure there is enough space (#367239) + HSpacing(30), + Left( + RadioButton( + Id(:mac), + _("MAC address: %s") % @mac + ) + ), + Left( + RadioButton( + Id(:bus_id), + _("BusID: %s") % @bus_id + ) + ) + ) + ) + ) + end + + private + + def current_value + [selected_udev_type, current_hwinfo] + end + + # Determines the hardware information used to match + # + # @return [HWinfo] + def current_hwinfo + case selected_udev_type + when :mac + args = { mac: @mac } + when :bus_id + args = { busid: @bus_id } + args[:dev_port] = @dev_port if @dev_port + end + Y2Network::Hwinfo.new(args) + end + + def selected_udev_type + Yast::UI.QueryWidget(Id(:udev_type), :Value) + end + end + end +end diff --git a/test/y2network/widgets/rename_hwinfo_test.rb b/test/y2network/widgets/rename_hwinfo_test.rb new file mode 100644 index 000000000..0d0bbf123 --- /dev/null +++ b/test/y2network/widgets/rename_hwinfo_test.rb @@ -0,0 +1,77 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/rename_hwinfo" +require "y2network/interface_config_builder" +require "y2network/physical_interface" + +describe Y2Network::Widgets::RenameHwinfo do + subject { described_class.new(builder) } + + let(:builder) do + instance_double(Y2Network::InterfaceConfigBuilder, interface: interface) + end + + let(:interface) { Y2Network::PhysicalInterface.new("eth0") } + let(:hwinfo) { Y2Network::Hwinfo.new(mac: "01:23:45:67:89:ab", busid: "0000:08:00.0") } + let(:mechanism) { :mac } + + include_examples "CWM::CustomWidget" + + before do + allow(interface).to receive(:hardware).and_return(hwinfo) + allow(subject).to receive(:selected_udev_type).and_return(mechanism) + end + + describe "#value" do + before do + subject.init + subject.store + end + + context "when the MAC is selected as renaming method" do + it "returns :mac as the renaming mechanism" do + selected_mechanism, = subject.value + expect(selected_mechanism).to eq(:mac) + end + + it "returns an Hwinfo containig the MAC" do + _, hwinfo = subject.value + expect(hwinfo).to eq(Y2Network::Hwinfo.new(mac: hwinfo.mac)) + end + end + + context "when the BUS ID is selected as renaming method" do + let(:mechanism) { :bus_id } + + it "returns :bus_id as the renaming mechanism" do + selected_mechanism, = subject.value + expect(selected_mechanism).to eq(:bus_id) + end + + it "returns an Hwinfo containig the MAC" do + _, hwinfo = subject.value + expect(hwinfo).to eq(Y2Network::Hwinfo.new(busid: hwinfo.busid)) + end + end + end +end From 6ddc382bc5cda8d6eee9a3a9674d306f9472b40e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 27 Aug 2019 15:58:29 +0200 Subject: [PATCH 223/471] fix testsuite --- test/dns_test.rb | 276 +++++++++--------- test/host_test.rb | 2 + test/inst_setup_dhcp_test.rb | 1 + test/lan_test.rb | 5 + test/y2network/autoinst/config_reader_test.rb | 3 + 5 files changed, 151 insertions(+), 136 deletions(-) diff --git a/test/dns_test.rb b/test/dns_test.rb index 0042fc15b..bb3d9055a 100755 --- a/test/dns_test.rb +++ b/test/dns_test.rb @@ -23,196 +23,200 @@ require "yast" -module Yast - import "Arch" - import "DNS" - import "ProductControl" - import "Lan" +require "y2network/type_detector" +require "y2network/interface_type" - describe DNS do - let(:lan_config) do - Y2Network::Config.new(dns: dns_config, source: :sysconfig) - end - let(:dns_config) do - Y2Network::DNS.new(dhcp_hostname: true) - end +Yast.import "Arch" +Yast.import "DNS" +Yast.import "ProductControl" +Yast.import "Lan" +describe Yast::DNS do + let(:lan_config) do + Y2Network::Config.new(dns: dns_config, source: :sysconfig) + end + let(:dns_config) do + Y2Network::DNS.new(dhcp_hostname: true) + end + + subject { Yast::DNS } + + before do + allow(Yast::Lan).to receive(:Read) + allow(Yast::Lan).to receive(:yast_config).and_return(lan_config) + end + + describe ".default_dhcp_hostname" do before do - allow(Lan).to receive(:yast_config).and_return(lan_config) + allow(Yast::Arch).to receive(:is_laptop).and_return laptop + Yast::ProductControl.ReadControlFile(File.join(SCRStub::DATA_PATH, control_file)) end - describe ".default_dhcp_hostname" do - before do - allow(Arch).to receive(:is_laptop).and_return laptop - ProductControl.ReadControlFile(File.join(SCRStub::DATA_PATH, control_file)) - end - - context "with dhcp_hostname=true in control file" do - let(:control_file) { "dhcp_hostname_true.xml" } + context "with dhcp_hostname=true in control file" do + let(:control_file) { "dhcp_hostname_true.xml" } - context "in a laptop" do - let(:laptop) { true } + context "in a laptop" do + let(:laptop) { true } - it "returns the value from product features" do - expect(DNS.default_dhcp_hostname).to eql(true) - end + it "returns the value from product features" do + expect(subject.default_dhcp_hostname).to eql(true) end + end - context "in a workstation" do - let(:laptop) { false } + context "in a workstation" do + let(:laptop) { false } - it "returns the value from product features" do - expect(DNS.default_dhcp_hostname).to eql(true) - end + it "returns the value from product features" do + expect(subject.default_dhcp_hostname).to eql(true) end end + end - context "with dhcp_hostname=false in control file" do - let(:control_file) { "dhcp_hostname_false.xml" } + context "with dhcp_hostname=false in control file" do + let(:control_file) { "dhcp_hostname_false.xml" } - context "in a laptop" do - let(:laptop) { true } + context "in a laptop" do + let(:laptop) { true } - it "returns the value from product features" do - expect(DNS.default_dhcp_hostname).to eql(false) - end + it "returns the value from product features" do + expect(subject.default_dhcp_hostname).to eql(false) end + end - context "in a workstation" do - let(:laptop) { false } + context "in a workstation" do + let(:laptop) { false } - it "returns the value from product features" do - expect(DNS.default_dhcp_hostname).to eql(false) - end + it "returns the value from product features" do + expect(subject.default_dhcp_hostname).to eql(false) end end + end - context "without dhcp_hostname in control file" do - let(:control_file) { "dhcp_hostname_nil.xml" } + context "without dhcp_hostname in control file" do + let(:control_file) { "dhcp_hostname_nil.xml" } - context "in a laptop" do - let(:laptop) { true } + context "in a laptop" do + let(:laptop) { true } - it "returns false" do - expect(DNS.default_dhcp_hostname).to eql(false) - end + it "returns false" do + expect(subject.default_dhcp_hostname).to eql(false) end + end - context "in a workstation" do - let(:laptop) { false } + context "in a workstation" do + let(:laptop) { false } - it "returns true" do - expect(DNS.default_dhcp_hostname).to eql(true) - end + it "returns true" do + expect(subject.default_dhcp_hostname).to eql(true) end end end + end - describe ".IsHostLocal" do - let(:ip) { "10.111.66.75" } - let(:hostname_short) { "test" } - let(:hostname_fq) { "test.test.de" } - let(:output) { { "ip" => ip, "hostname_short" => hostname_short, "hostname_fq" => hostname_fq } } - let(:ipv4) { false } - let(:ipv6) { false } - let(:stdout) { double } - - before do - allow(Y2Network::TypeDetector) - .to receive(:type_of) - .with(/eth[0-9]/) - .and_return(Y2Network::InterfaceType::ETHERNET) - DNS.dhcp_hostname = true - - allow(DNS).to receive(:Read) - allow(IP).to receive(:Check4).and_return(ipv4) - allow(IP).to receive(:Check6).and_return(ipv6) - allow(Yast::Execute).to receive(:stdout).and_return(stdout) - allow(stdout).to receive(:on_target!).with("/bin/hostname -i").and_return(ip) - allow(stdout).to receive(:on_target!).with("/bin/hostname").and_return(hostname_short) - allow(stdout).to receive(:on_target!).with("/bin/hostname -f").and_return(hostname_fq) - end + describe ".IsHostLocal" do + let(:ip) { "10.111.66.75" } + let(:hostname_short) { "test" } + let(:hostname_fq) { "test.test.de" } + let(:output) { { "ip" => ip, "hostname_short" => hostname_short, "hostname_fq" => hostname_fq } } + let(:ipv4) { false } + let(:ipv6) { false } + let(:stdout) { double } - ["localhost", "localhost.localdomain", "::1", "127.0.0.1"].each do |host| - it "returns true when host is \"#{host}\"" do - expect(DNS.IsHostLocal(host)).to eq(true) - end - end + before do + allow(Y2Network::TypeDetector) + .to receive(:type_of) + .with(/eth[0-9]/) + .and_return(Y2Network::InterfaceType::ETHERNET) + allow(subject).to receive(:Read) + allow(Yast::IP).to receive(:Check4).and_return(ipv4) + allow(Yast::IP).to receive(:Check6).and_return(ipv6) + allow(Yast::Execute).to receive(:stdout).and_return(stdout) + allow(stdout).to receive(:on_target!).with("/bin/hostname -i").and_return(ip) + allow(stdout).to receive(:on_target!).with("/bin/hostname").and_return(hostname_short) + allow(stdout).to receive(:on_target!).with("/bin/hostname -f").and_return(hostname_fq) + + subject.dhcp_hostname = true + end - it "returns true when the short hostname is given" do - expect(DNS.IsHostLocal(hostname_short)).to eq(true) + ["localhost", "localhost.localdomain", "::1", "127.0.0.1"].each do |host| + it "returns true when host is \"#{host}\"" do + expect(subject.IsHostLocal(host)).to eq(true) end + end - it "returns true when the fq hostname is given" do - expect(DNS.IsHostLocal(hostname_fq)).to eq(true) - end + it "returns true when the short hostname is given" do + expect(subject.IsHostLocal(hostname_short)).to eq(true) + end - context "for IPv4" do - let(:ipv4) { true } + it "returns true when the fq hostname is given" do + expect(subject.IsHostLocal(hostname_fq)).to eq(true) + end - it "returns true when the ip of local machine is given" do - expect(DNS.IsHostLocal(ip)).to eq(true) - end + context "for IPv4" do + let(:ipv4) { true } - it "returns false when the ip of local machine is not given" do - expect(DNS.IsHostLocal("1.2.3.4")).to eq(false) - end + it "returns true when the ip of local machine is given" do + expect(subject.IsHostLocal(ip)).to eq(true) end - end - describe ".Read" do - it "delegates DNS settings reading to Yast::Lan module" do - expect(Yast::Lan).to receive(:Read).with(:cache) - Yast::DNS.Read + it "returns false when the ip of local machine is not given" do + expect(subject.IsHostLocal("1.2.3.4")).to eq(false) end end + end - describe ".Write" do - let(:dns_writer) { instance_double(Y2Network::Sysconfig::DNSWriter) } - let(:yast_config) { double("Y2Network::Config", dns: instance_double("Y2Network::DNS")) } - let(:system_config) { double("Y2Network::Config", dns: instance_double("Y2Network::DNS")) } + describe ".Read" do + it "delegates DNS settings reading to Yast::Lan module" do + expect(Yast::Lan).to receive(:Read).with(:cache) + subject.Read + end + end - before do - allow(Y2Network::Sysconfig::DNSWriter).to receive(:new).and_return(dns_writer) - allow(Yast::Lan).to receive(:yast_config).and_return(yast_config) - allow(Yast::Lan).to receive(:system_config).and_return(system_config) - end + describe ".Write" do + let(:dns_writer) { instance_double(Y2Network::Sysconfig::DNSWriter) } + let(:yast_config) { double("Y2Network::Config", dns: instance_double("Y2Network::DNS")) } + let(:system_config) { double("Y2Network::Config", dns: instance_double("Y2Network::DNS")) } - it "writes DNS settings" do - expect(dns_writer).to receive(:write).with(yast_config.dns, system_config.dns) - DNS.Write - end + before do + allow(Y2Network::Sysconfig::DNSWriter).to receive(:new).and_return(dns_writer) + allow(Yast::Lan).to receive(:yast_config).and_return(yast_config) + allow(Yast::Lan).to receive(:system_config).and_return(system_config) + end + + it "writes DNS settings" do + expect(dns_writer).to receive(:write).with(yast_config.dns, system_config.dns) + subject.Write end + end - describe ".modified" do - let(:yast_config) { double("Y2Network::Config", dns: double("dns")) } - let(:system_config) { double("Y2Network::Config", dns: double("dns")) } + describe ".modified" do + let(:yast_config) { double("Y2Network::Config", dns: double("dns")) } + let(:system_config) { double("Y2Network::Config", dns: double("dns")) } - before do - allow(Yast::Lan).to receive(:yast_config).and_return(yast_config) - allow(Yast::Lan).to receive(:system_config).and_return(system_config) - end + before do + allow(Yast::Lan).to receive(:yast_config).and_return(yast_config) + allow(Yast::Lan).to receive(:system_config).and_return(system_config) + end - context "when DNS configuration has changed" do - it "returns true" do - expect(DNS.modified).to eq(true) - end + context "when DNS configuration has changed" do + it "returns true" do + expect(subject.modified).to eq(true) end + end - context "when DNS configuration has not changed" do - let(:system_config) { double("Y2Network::Config", dns: yast_config.dns) } + context "when DNS configuration has not changed" do + let(:system_config) { double("Y2Network::Config", dns: yast_config.dns) } - it "returns false" do - expect(DNS.modified).to eq(false) - end + it "returns false" do + expect(subject.modified).to eq(false) end end + end - describe "#propose_hostname" do - it "proposes a hostname" do - expect(dns_config).to receive(:ensure_hostname!) - DNS.propose_hostname - end + describe "#propose_hostname" do + it "proposes a hostname" do + expect(dns_config).to receive(:ensure_hostname!) + subject.propose_hostname end end end diff --git a/test/host_test.rb b/test/host_test.rb index 29ff9ee22..465874316 100755 --- a/test/host_test.rb +++ b/test/host_test.rb @@ -26,6 +26,7 @@ require "cfa/memory_file" require "cfa/base_model" require "cfa/hosts" +require "y2network/sysconfig/type_detector" Yast.import "Host" Yast.import "DNS" @@ -50,6 +51,7 @@ end before do + allow(Yast::Lan).to receive(:Read) allow(Yast::Lan).to receive(:yast_config).and_return(lan_config) allow(Yast::SCR).to receive(:Read).with(path(".target.size"), "/etc/hosts").and_return(50) allow(Y2Network::Sysconfig::TypeDetector) diff --git a/test/inst_setup_dhcp_test.rb b/test/inst_setup_dhcp_test.rb index 19f55405d..edbe7fd68 100755 --- a/test/inst_setup_dhcp_test.rb +++ b/test/inst_setup_dhcp_test.rb @@ -31,6 +31,7 @@ end before do + allow(Yast::Lan).to receive(:Read).and_return(lan_config) allow(Yast::Lan).to receive(:yast_config).and_return(lan_config) end diff --git a/test/lan_test.rb b/test/lan_test.rb index 6e7e57f68..cfda96d60 100755 --- a/test/lan_test.rb +++ b/test/lan_test.rb @@ -24,6 +24,7 @@ require "yast" require "y2network/config" require "y2network/routing" +require "y2network/interface_config_builder" Yast.import "Lan" @@ -532,6 +533,10 @@ def expect_modification_succeedes(modname, method) context "when wicked is in use" do let(:nm_enabled) { false } + before do + allow(Yast::Lan).to receive(:ReadWithCacheNoGUI) + end + it "reads the current network configuration" do expect(Yast::Lan).to receive(:ReadWithCacheNoGUI) subject.dhcp_ntp_servers diff --git a/test/y2network/autoinst/config_reader_test.rb b/test/y2network/autoinst/config_reader_test.rb index 080b68267..8b5843937 100644 --- a/test/y2network/autoinst/config_reader_test.rb +++ b/test/y2network/autoinst/config_reader_test.rb @@ -22,6 +22,7 @@ require_relative "../../test_helper" require "y2network/autoinst_profile/networking_section" require "y2network/autoinst/config_reader" +require "y2network/sysconfig/interfaces_reader" describe Y2Network::Autoinst::ConfigReader do let(:subject) { described_class.new(networking_section) } @@ -61,6 +62,8 @@ describe "#config" do it "builds a new Y2Network::Config from a Y2Networking::Section" do + # TODO: mock hardware properly + allow_any_instance_of(Y2Network::Sysconfig::InterfacesReader).to receive(:hardware).and_return([]) expect(subject.config).to be_a Y2Network::Config expect(subject.config.routing).to be_a Y2Network::Routing expect(subject.config.dns).to be_a Y2Network::DNS From a95fda3cec10d686abb0c7b5c3bda60bb51e3a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 26 Aug 2019 15:19:42 +0100 Subject: [PATCH 224/471] Replace EditNicName with a new RenameInterface dialog --- src/lib/y2network/dialogs/rename_interface.rb | 82 ++++++++++++++++ src/lib/y2network/widgets/udev_rules.rb | 8 +- .../dialogs/rename_interface_test.rb | 98 +++++++++++++++++++ test/y2network/widgets/udev_rules_test.rb | 3 +- 4 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 src/lib/y2network/dialogs/rename_interface.rb create mode 100644 test/y2network/dialogs/rename_interface_test.rb diff --git a/src/lib/y2network/dialogs/rename_interface.rb b/src/lib/y2network/dialogs/rename_interface.rb new file mode 100644 index 000000000..1ad189cc7 --- /dev/null +++ b/src/lib/y2network/dialogs/rename_interface.rb @@ -0,0 +1,82 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "cwm/popup" +require "y2network/widgets/custom_interface_name" +require "y2network/widgets/rename_hwinfo" + +module Y2Network + module Dialogs + # This dialog allows the user to rename a network interface + # + # Is works in a slightly different way depending on the interface. + # + # * For physical interfaces, it allows the user to select between using + # the MAC adddress or the Bus ID, which are present in the Hwinfo object + # associated to the interface. + # * For not connected interfaces ({FakeInterface}), as the hardware is not present, + # the user must specify the MAC or the Bus ID by hand (NOT IMPLEMENTED YET). + # * For virtual interfaces, like bridges, only the name can be chaned (no hardware + # info at all) (NOT IMPLEMENTED YET). + class RenameInterface < CWM::Popup + def initialize(builder) + textdomain "network" + + @builder = builder + interface = @builder.interface + @old_name = interface.name + end + + # Runs the dialog + def run + ret = super + return unless ret == :ok + renaming_mechanism, _hwinfo = rename_hwinfo_widget.value + @builder.rename_interface(name_widget.value, renaming_mechanism) + name_widget.value + end + + # @see CWM::CustomWidget + def contents + VBox( + Left(name_widget), + VSpacing(0.5), + Frame( + _("Base Udev Rule On"), + rename_hwinfo_widget + ) + ) + end + + # Interface's name widget + # + # @return [Y2Network::Widgets::CustomInterfaceName] + def name_widget + @name_widget ||= Y2Network::Widgets::CustomInterfaceName.new(@builder) + end + + # Widget to select the hardware information to base the rename on + # + # @return [Y2Network::Widgets::RenameHwinfo] + def rename_hwinfo_widget + @rename_hwinfo_widget ||= Y2Network::Widgets::RenameHwinfo.new(@builder) + end + end + end +end diff --git a/src/lib/y2network/widgets/udev_rules.rb b/src/lib/y2network/widgets/udev_rules.rb index fb88c5aa7..c21a082f4 100644 --- a/src/lib/y2network/widgets/udev_rules.rb +++ b/src/lib/y2network/widgets/udev_rules.rb @@ -19,7 +19,7 @@ require "yast" require "cwm/custom_widget" -require "network/edit_nic_name" +require "y2network/dialogs/rename_interface" Yast.import "UI" @@ -42,17 +42,17 @@ def contents end def init - self.value = @settings.udev_name + self.value = @settings.name end def handle - self.value = Yast::EditNicName.new(@settings).run + self.value = Y2Network::Dialogs::RenameInterface.new(@settings).run nil end def store - # TODO: nothing to do as done in EditNicName which looks wrong + # TODO: nothing to do as done in RenameInterface which looks wrong end def value=(name) diff --git a/test/y2network/dialogs/rename_interface_test.rb b/test/y2network/dialogs/rename_interface_test.rb new file mode 100644 index 000000000..115788326 --- /dev/null +++ b/test/y2network/dialogs/rename_interface_test.rb @@ -0,0 +1,98 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/dialogs/rename_interface" +require "y2network/interface_config_builder" +require "y2network/widgets/custom_interface_name" +require "y2network/widgets/rename_hwinfo" +require "y2network/physical_interface" + +describe Y2Network::Dialogs::RenameInterface do + subject { described_class.new(builder) } + + let(:builder) do + Y2Network::InterfaceConfigBuilder.for("eth").tap do |builder| + builder.name = "eth0" + end + end + + let(:name_widget) do + Y2Network::Widgets::CustomInterfaceName.new(builder) + end + + let(:rename_hwinfo_widget) do + Y2Network::Widgets::RenameHwinfo.new(builder) + end + + let(:interface) do + Y2Network::PhysicalInterface.new("eth0") + end + + let(:hardware) do + Y2Network::Hwinfo.new(mac: "01:23:45:67:89:ab", busid: "0000:08:00.0") + end + + let(:rename_hwinfo) do + Y2Network::Hwinfo.new(mac: "01:23:45:67:89:ab") + end + + let(:new_name) { "eth1" } + + let(:result) { :ok } + + include_examples "CWM::Dialog" + + before do + allow(builder).to receive(:interface).and_return(interface) + allow(subject).to receive(:cwm_show).and_return(result) + allow(Y2Network::Widgets::CustomInterfaceName).to receive(:new).and_return(name_widget) + allow(Y2Network::Widgets::RenameHwinfo).to receive(:new).and_return(rename_hwinfo_widget) + allow(name_widget).to receive(:value).and_return(new_name) + allow(rename_hwinfo_widget).to receive(:value).and_return(rename_hwinfo) + allow(interface).to receive(:hardware).and_return(hardware) + end + + describe "#run" do + before do + allow(Yast::UI).to receive(:UserInput).and_return(:ok) + end + + context "when the user accepts the change" do + let(:result) { :ok } + + it "renames the interface" do + expect(builder).to receive(:rename_interface) + .with(new_name, rename_hwinfo) + subject.run + end + end + + context "when the user clicks the cancel button" do + let(:result) { :cancel } + + it "doest not rename the interface" do + expect(builder).to_not receive(:rename_interface) + subject.run + end + end + end +end diff --git a/test/y2network/widgets/udev_rules_test.rb b/test/y2network/widgets/udev_rules_test.rb index 092912429..aa504f088 100644 --- a/test/y2network/widgets/udev_rules_test.rb +++ b/test/y2network/widgets/udev_rules_test.rb @@ -21,13 +21,14 @@ require "cwm/rspec" require "y2network/widgets/udev_rules" +require "y2network/dialogs/rename_interface" describe Y2Network::Widgets::UdevRules do subject { described_class.new({}) } before do allow(Yast::LanItems).to receive(:current_udev_name).and_return("hell666") - allow(Yast::EditNicName).to receive(:new).and_return(double(run: "heaven010")) + allow(Y2Network::Dialogs::RenameInterface).to receive(:new).and_return(double(run: "heaven010")) end include_examples "CWM::CustomWidget" From 6fe6e044fa275846882cb9c754ce41f41820165e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 26 Aug 2019 13:01:21 +0100 Subject: [PATCH 225/471] Add a method Hwinfo#merge! --- src/lib/y2network/hwinfo.rb | 7 +++++++ test/y2network/hwinfo_test.rb | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index bf4e2e6bc..d34384f96 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -123,6 +123,13 @@ def description @hwinfo ? @hwinfo.fetch("name", "") : "" end + # Merges data from another Hwinfo object + # + # @param other [Hwinfo] Object to merge data from + def merge!(other) + @hwinfo.merge!(other.hwinfo) + end + # Returns the list of kernel modules # # The list of modules is internally represented as: diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 90b34176d..c5ca665f9 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -49,6 +49,18 @@ end end + describe "#merge!" do + subject(:hwinfo) { described_class.new(mac: "00:11:22:33:44:55:66", busid: "0000:08:00.0") } + let(:other) { described_class.new(mac: "01:23:45:78:90:ab", dev_port: "1") } + + it "merges data from another Hwinfo object" do + hwinfo.merge!(other) + expect(hwinfo.mac).to eq(other.mac) + expect(hwinfo.busid).to eq("0000:08:00.0") + expect(hwinfo.dev_port).to eq("1") + end + end + describe "#drivers" do it "returns the list of kernel modules names" do expect(hwinfo.drivers).to eq( From 509fb28cd910fa4e0ceee8b8155d007f1acc9837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 26 Aug 2019 16:16:48 +0100 Subject: [PATCH 226/471] Hwinfo.for reads data from udev rules as last resort --- src/lib/y2network/hwinfo.rb | 42 ++++++++++++++++++++++++---- src/lib/y2network/udev_rule.rb | 41 +++++++++++++++++++++++++++ test/y2network/hwinfo_test.rb | 31 +++++++++++++++++++++ test/y2network/udev_rule_test.rb | 48 ++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index d34384f96..c055f8448 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -31,14 +31,28 @@ class Hwinfo class << self # Creates a new instance containing hardware information for a given interface # + # It retrieves the information from two sources: + # + # * hardware (through {Yast::LanItems} for the time being), + # * from existing udev rules. + # + # @todo Probably, this logic should be moved to a separate class. + # # @param name [String] Interface's name + # @return [Hwinfo] def for(name) - new(load_hwinfo(name)) + hwinfo_from_hardware(name) || hwinfo_from_udev(name) || Hwinfo.new end private - def load_hwinfo(name) + # Returns hardware information for the given device + # + # It relies on the {Yast::LanItems} module. + # + # @param name [String] Interface's name + # @return [Hwinfo,nil] Hardware info or nil if not found + def hwinfo_from_hardware(name) hw = Yast::LanItems.Hardware.find { |h| h["dev_name"] == name } return nil if hw.nil? @@ -46,7 +60,24 @@ def load_hwinfo(name) Yast::Path.new(".target.string"), "/sys/class_net/#{name}/dev_port" ).to_s.strip hw["dev_port"] = raw_dev_port unless raw_dev_port.empty? - hw + new(hw) + end + + # Returns hardware information for the given device + # + # It relies on udev rules. + # + # @param name [String] Interface's name + # @return [Hwinfo,nil] Hardware info or nil if not found + def hwinfo_from_udev(name) + udev_rule = UdevRule.find_for(name) + return Hwinfo.new if udev_rule.nil? + info = { + udev: udev_rule.bus_id, + mac: udev_rule.mac, + dev_port: udev_rule.dev_port + }.compact + new(info) end end @@ -114,7 +145,7 @@ def initialize(hwinfo = {}) alias_method :name, :dev_name def exists? - !@hwinfo.nil? + !@hwinfo.empty? end # Device type description @@ -128,6 +159,7 @@ def description # @param other [Hwinfo] Object to merge data from def merge!(other) @hwinfo.merge!(other.hwinfo) + self end # Returns the list of kernel modules @@ -152,7 +184,7 @@ def drivers # @param other [Hwinfo] Object to compare with # @return [Boolean] def ==(other) - hwinfo.reject { |_k, v| v.nil? } == other.hwinfo.reject { |_k, v| v.nil? } + hwinfo.compact == other.hwinfo.compact end alias_method :eql?, :== diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 572453e4e..7d7bcd416 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -136,5 +136,46 @@ def add_part(key, operator, value) def to_s parts.map(&:to_s).join(", ") end + + # Returns the part with the given key + # + # @param key [String] Key name + def part_by_key(key) + parts.find { |p| p.key == key } + end + + # Returns the value for a given part + # + # @param key [String] Key name + # @return [String,nil] Value or nil if not found a part which such a key + def part_value_for(key) + part = part_by_key(key) + return nil unless part + part.value + end + + # Returns the MAC in the udev rule + # + # @return [String,nil] MAC address or nil if not found + # @see #part_value_for + def mac + part_value_for("ATTR{address}") + end + + # Returns the BUS ID in the udev rule + # + # @return [String,nil] BUS ID or nil if not found + # @see #part_value_for + def bus_id + part_value_for("KERNELS") + end + + # Returns the device port in the udev rule + # + # @return [String,nil] Device port or nil if not found + # @see #part_value_for + def dev_port + part_value_for("ATTR{dev_port}") + end end end diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index c5ca665f9..120c06370 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -31,6 +31,37 @@ before do allow(Yast::LanItems).to receive(:Hardware).and_return(hardware) + allow(Y2Network::UdevRule).to receive(:find_for).with(interface_name).and_return(udev_rule) + end + + let(:udev_rule) { nil } + + describe ".for" do + context "when there is info from hardware" do + it "returns a hwinfo object containing the info from hardware" do + hwinfo = described_class.for(interface_name) + expect(hwinfo.mac).to eq("52:54:00:68:54:fb") + end + end + + context "when there is no info from hardware" do + let(:hardware) { [] } + let(:udev_rule) { Y2Network::UdevRule.new_mac_based_rename(interface_name, "01:23:45:67:89:ab") } + + it "returns info from udev rules" do + hwinfo = described_class.for(interface_name) + expect(hwinfo.mac).to eq("01:23:45:67:89:ab") + end + + context "when there is no info from udev rules" do + let(:udev_rule) { nil } + + it "returns nil" do + hwinfo = described_class.for(interface_name) + expect(hwinfo.exists?).to eq(false) + end + end + end end describe "#exists?" do diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index c0541b99b..a24536d05 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -106,4 +106,52 @@ ) end end + + describe "#mac" do + subject(:udev_rule) { described_class.new_mac_based_rename("eth0", "01:23:45:67:89:ab") } + + it "returns the MAC from the udev rule" do + expect(udev_rule.mac).to eq("01:23:45:67:89:ab") + end + + context "if no MAC address is present" do + subject(:udev_rule) { described_class.new } + + it "returns nil" do + expect(udev_rule.mac).to be_nil + end + end + end + + describe "#bus_id" do + subject(:udev_rule) { described_class.new_bus_id_based_rename("eth0", "0000:08:00.0") } + + it "returns the BUS ID from the udev rule" do + expect(udev_rule.bus_id).to eq("0000:08:00.0") + end + + context "if no BUS ID is present" do + subject(:udev_rule) { described_class.new } + + it "returns nil" do + expect(udev_rule.bus_id).to be_nil + end + end + end + + describe "#bus_id" do + subject(:udev_rule) { described_class.new_bus_id_based_rename("eth0", "0000:08:00.0", "1") } + + it "returns the device port from the udev rule" do + expect(udev_rule.dev_port).to eq("1") + end + + context "if no device port is present" do + subject(:udev_rule) { described_class.new } + + it "returns nil" do + expect(udev_rule.dev_port).to be_nil + end + end + end end From 2cc1693c054dcb646ca7b2875bd4080fd5fb1e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 27 Aug 2019 13:15:49 +0100 Subject: [PATCH 227/471] Add an Interface#can_be_renamed? method --- src/lib/y2network/hwinfo.rb | 4 +-- src/lib/y2network/interface.rb | 9 +++++++ src/lib/y2network/virtual_interface.rb | 9 +++++++ test/y2network/interface_test.rb | 32 ++++++++++++++++++++++++ test/y2network/virtual_interface_test.rb | 31 +++++++++++++++++++++++ 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 test/y2network/virtual_interface_test.rb diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index c055f8448..6949bf00a 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -123,8 +123,8 @@ def initialize(hwinfo = {}) # @return [String,nil] [ { name: "dev_name", default: "" }, - { name: "mac", default: "" }, - { name: "busid", default: "" }, + { name: "mac", default: nil }, + { name: "busid", default: nil }, { name: "link", default: false }, { name: "driver", default: "" }, { name: "module", default: nil }, diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 9e81a4add..ab1de2c63 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -120,6 +120,15 @@ def rename(new_name, mechanism) @renaming_mechanism = mechanism end + # Determines whether the interface can be renamed + # + # An interface can be renamed if it has a MAC address or a Bus ID. + # + # @return [Boolean] + def can_be_renamed? + hardware && !(hardware.mac.nil? && hardware.busid.nil?) + end + private def system_config(name) diff --git a/src/lib/y2network/virtual_interface.rb b/src/lib/y2network/virtual_interface.rb index f9bcecda0..9d03ef93a 100644 --- a/src/lib/y2network/virtual_interface.rb +++ b/src/lib/y2network/virtual_interface.rb @@ -31,5 +31,14 @@ class VirtualInterface < Interface def self.from_connection(name, conn) new(name, type: conn.type) end + + # Determines whether the interface can be renamed + # + # A virtual interface can always be renamed. + # + # @return [Boolean] + def can_be_renamed? + true + end end end diff --git a/test/y2network/interface_test.rb b/test/y2network/interface_test.rb index 62c3d90db..3f0d079c7 100644 --- a/test/y2network/interface_test.rb +++ b/test/y2network/interface_test.rb @@ -54,4 +54,36 @@ expect(interface.drivers).to eq([driver]) end end + + describe "#can_be_renamed?" do + let(:mac) { nil } + let(:busid) { nil } + let(:hwinfo) { instance_double(Y2Network::Hwinfo, mac: mac, busid: busid) } + + before do + allow(interface).to receive(:hardware).and_return(hwinfo) + end + + context "when no MAC or Bus ID information is available" do + it "returns false" do + expect(interface.can_be_renamed?).to eq(false) + end + end + + context "when the MAC address is present" do + let(:mac) { "01:23:45:67:89:ab" } + + it "returns true" do + expect(interface.can_be_renamed?).to eq(true) + end + end + + context "when the Bus ID is present" do + let(:busid) { "0000:08:00.0" } + + it "returns true" do + expect(interface.can_be_renamed?).to eq(true) + end + end + end end diff --git a/test/y2network/virtual_interface_test.rb b/test/y2network/virtual_interface_test.rb new file mode 100644 index 000000000..a3a4710d2 --- /dev/null +++ b/test/y2network/virtual_interface_test.rb @@ -0,0 +1,31 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" +require "y2network/virtual_interface" + +describe Y2Network::VirtualInterface do + subject(:interface) { described_class.new("br0") } + + describe "#can_be_renamed?" do + it "returns true" do + expect(interface.can_be_renamed?).to eq(true) + end + end +end From a38455a2ec6dfd7b9c57eb700c7f255a6829f7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 27 Aug 2019 13:20:05 +0100 Subject: [PATCH 228/471] Remove initial support to allow modifying hwinfo --- src/lib/y2network/widgets/rename_hwinfo.rb | 29 ++++---------------- test/y2network/widgets/rename_hwinfo_test.rb | 12 +------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/lib/y2network/widgets/rename_hwinfo.rb b/src/lib/y2network/widgets/rename_hwinfo.rb index 51f3483d0..843588613 100644 --- a/src/lib/y2network/widgets/rename_hwinfo.rb +++ b/src/lib/y2network/widgets/rename_hwinfo.rb @@ -36,16 +36,15 @@ def initialize(builder) @builder = builder interface = builder.interface - return unless interface.hardware # FIXME: handle interfaces with no hardware information - @hwinfo = interface.hardware || Y2Network::Hwinfo.new({}) + @hwinfo = interface.hardware @mac = @hwinfo.mac @bus_id = @hwinfo.busid + @renaming_mechanism = interface.renaming_mechanism end # @see CWM::AbstractWidget def init - udev_attr = @hwinfo.busid && !@hwinfo.busid.empty? ? :bus_id : :mac - Yast::UI.ChangeWidget(Id(:udev_type), :Value, udev_attr) + Yast::UI.ChangeWidget(Id(:udev_type), :Value, @renaming_mechanism) end # @see CWM::AbstractWidget @@ -55,7 +54,7 @@ def store # @see CWM::CustomWidget def contents - VBox( + Frame( _("Base Udev Rule On"), RadioButtonGroup( Id(:udev_type), @@ -66,7 +65,7 @@ def contents RadioButton( Id(:mac), _("MAC address: %s") % @mac - ) + ), ), Left( RadioButton( @@ -82,24 +81,6 @@ def contents private def current_value - [selected_udev_type, current_hwinfo] - end - - # Determines the hardware information used to match - # - # @return [HWinfo] - def current_hwinfo - case selected_udev_type - when :mac - args = { mac: @mac } - when :bus_id - args = { busid: @bus_id } - args[:dev_port] = @dev_port if @dev_port - end - Y2Network::Hwinfo.new(args) - end - - def selected_udev_type Yast::UI.QueryWidget(Id(:udev_type), :Value) end end diff --git a/test/y2network/widgets/rename_hwinfo_test.rb b/test/y2network/widgets/rename_hwinfo_test.rb index 0d0bbf123..85924223e 100644 --- a/test/y2network/widgets/rename_hwinfo_test.rb +++ b/test/y2network/widgets/rename_hwinfo_test.rb @@ -39,7 +39,7 @@ before do allow(interface).to receive(:hardware).and_return(hwinfo) - allow(subject).to receive(:selected_udev_type).and_return(mechanism) + allow(subject).to receive(:current_value).and_return(mechanism) end describe "#value" do @@ -53,11 +53,6 @@ selected_mechanism, = subject.value expect(selected_mechanism).to eq(:mac) end - - it "returns an Hwinfo containig the MAC" do - _, hwinfo = subject.value - expect(hwinfo).to eq(Y2Network::Hwinfo.new(mac: hwinfo.mac)) - end end context "when the BUS ID is selected as renaming method" do @@ -67,11 +62,6 @@ selected_mechanism, = subject.value expect(selected_mechanism).to eq(:bus_id) end - - it "returns an Hwinfo containig the MAC" do - _, hwinfo = subject.value - expect(hwinfo).to eq(Y2Network::Hwinfo.new(busid: hwinfo.busid)) - end end end end From f2b0939e6af65196960abce6dd6038e187ea55e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 27 Aug 2019 14:30:41 +0100 Subject: [PATCH 229/471] Adapt interface to support renaming virtual/physical interfaces --- src/lib/y2network/dialogs/rename_interface.rb | 28 ++++++++++++++----- src/lib/y2network/interface_config_builder.rb | 4 +-- src/lib/y2network/widgets/rename_hwinfo.rb | 26 ++++++++--------- src/lib/y2network/widgets/udev_rules.rb | 8 +++++- test/y2network/widgets/rename_hwinfo_test.rb | 2 +- test/y2network/widgets/udev_rules_test.rb | 7 ++++- 6 files changed, 50 insertions(+), 25 deletions(-) diff --git a/src/lib/y2network/dialogs/rename_interface.rb b/src/lib/y2network/dialogs/rename_interface.rb index 1ad189cc7..379085c4a 100644 --- a/src/lib/y2network/dialogs/rename_interface.rb +++ b/src/lib/y2network/dialogs/rename_interface.rb @@ -39,7 +39,6 @@ def initialize(builder) textdomain "network" @builder = builder - interface = @builder.interface @old_name = interface.name end @@ -47,7 +46,7 @@ def initialize(builder) def run ret = super return unless ret == :ok - renaming_mechanism, _hwinfo = rename_hwinfo_widget.value + renaming_mechanism = rename_hwinfo_widget.value unless virtual_interface? @builder.rename_interface(name_widget.value, renaming_mechanism) name_widget.value end @@ -56,14 +55,17 @@ def run def contents VBox( Left(name_widget), - VSpacing(0.5), - Frame( - _("Base Udev Rule On"), - rename_hwinfo_widget - ) + *hardware_info ) end + private + + # Elements to display the hardware information + def hardware_info + virtual_interface? ? [Empty()] : [VSpacing(0.5), rename_hwinfo_widget] + end + # Interface's name widget # # @return [Y2Network::Widgets::CustomInterfaceName] @@ -77,6 +79,18 @@ def name_widget def rename_hwinfo_widget @rename_hwinfo_widget ||= Y2Network::Widgets::RenameHwinfo.new(@builder) end + + # Returns the interface + # + # @return [Y2Network::Interface] + def interface + @builder.interface + end + + # Determines whether it is a virtual interface + def virtual_interface? + interface.is_a?(Y2Network::VirtualInterface) + end end end end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 3ef278e87..b8811ac5c 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -121,7 +121,7 @@ def renamed_interface? # # @param new_name [String] New interface's name # @param renaming_mechanism [Symbol,nil] Mechanism to rename the interface - # (nil -no rename-, :mac or :bus_id) + # (no hardware based, :mac or :bus_id) def rename_interface(new_name, renaming_mechanism) @old_name ||= name self.name = new_name @@ -309,7 +309,7 @@ def aliases=(value) # gets interface name that will be assigned by udev def udev_name - # cannot cache as EditNicName dialog can change it + # cannot cache as it can be changed Yast::LanItems.current_udev_name end diff --git a/src/lib/y2network/widgets/rename_hwinfo.rb b/src/lib/y2network/widgets/rename_hwinfo.rb index 843588613..33cba0a1c 100644 --- a/src/lib/y2network/widgets/rename_hwinfo.rb +++ b/src/lib/y2network/widgets/rename_hwinfo.rb @@ -39,7 +39,7 @@ def initialize(builder) @hwinfo = interface.hardware @mac = @hwinfo.mac @bus_id = @hwinfo.busid - @renaming_mechanism = interface.renaming_mechanism + @renaming_mechanism = builder.renaming_mechanism || :mac end # @see CWM::AbstractWidget @@ -52,6 +52,10 @@ def store @value = current_value end + def value + @value ||= current_value + end + # @see CWM::CustomWidget def contents Frame( @@ -61,18 +65,7 @@ def contents VBox( # make sure there is enough space (#367239) HSpacing(30), - Left( - RadioButton( - Id(:mac), - _("MAC address: %s") % @mac - ), - ), - Left( - RadioButton( - Id(:bus_id), - _("BusID: %s") % @bus_id - ) - ) + *radio_buttons ) ) ) @@ -83,6 +76,13 @@ def contents def current_value Yast::UI.QueryWidget(Id(:udev_type), :Value) end + + def radio_buttons + buttons = [] + buttons << Left(RadioButton(Id(:mac), _("MAC address: %s") % @mac)) if @mac + buttons << Left(RadioButton(Id(:bus_id), _("BusID: %s") % @bus_id)) if @bus_id + buttons + end end end end diff --git a/src/lib/y2network/widgets/udev_rules.rb b/src/lib/y2network/widgets/udev_rules.rb index c21a082f4..de8849ad8 100644 --- a/src/lib/y2network/widgets/udev_rules.rb +++ b/src/lib/y2network/widgets/udev_rules.rb @@ -36,7 +36,7 @@ def contents _("Udev Rules"), HBox( InputField(Id(:udev_rules_name), Opt(:hstretch, :disabled), _("Device Name"), ""), - PushButton(Id(:udev_rules_change), _("Change")) + @settings.interface.can_be_renamed? ? change_button : Empty() ) ) end @@ -70,6 +70,12 @@ def help "example, eth1, wlan0 ) and assures a persistent device name upon reboot.\n" ) end + + private + + def change_button + PushButton(Id(:udev_rules_change), _("Change")) + end end end end diff --git a/test/y2network/widgets/rename_hwinfo_test.rb b/test/y2network/widgets/rename_hwinfo_test.rb index 85924223e..db265437a 100644 --- a/test/y2network/widgets/rename_hwinfo_test.rb +++ b/test/y2network/widgets/rename_hwinfo_test.rb @@ -28,7 +28,7 @@ subject { described_class.new(builder) } let(:builder) do - instance_double(Y2Network::InterfaceConfigBuilder, interface: interface) + instance_double(Y2Network::InterfaceConfigBuilder, interface: interface, renaming_mechanism: mechanism) end let(:interface) { Y2Network::PhysicalInterface.new("eth0") } diff --git a/test/y2network/widgets/udev_rules_test.rb b/test/y2network/widgets/udev_rules_test.rb index aa504f088..2bcf01fd1 100644 --- a/test/y2network/widgets/udev_rules_test.rb +++ b/test/y2network/widgets/udev_rules_test.rb @@ -22,9 +22,14 @@ require "y2network/widgets/udev_rules" require "y2network/dialogs/rename_interface" +require "y2network/interface_config_builder" describe Y2Network::Widgets::UdevRules do - subject { described_class.new({}) } + subject { described_class.new(builder) } + + let(:builder) do + instance_double(Y2Network::InterfaceConfigBuilder, interface: double(can_be_renamed?: true)) + end before do allow(Yast::LanItems).to receive(:current_udev_name).and_return("hell666") From b883a86a77f31eebfb0cdf4661f70fcbb6e09c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 27 Aug 2019 14:35:39 +0100 Subject: [PATCH 230/471] Drop EditNicName UI --- src/lib/network/edit_nic_name.rb | 176 ---------------------------- test/network/edit_nic_name_test.rb | 180 ----------------------------- 2 files changed, 356 deletions(-) delete mode 100644 src/lib/network/edit_nic_name.rb delete mode 100755 test/network/edit_nic_name_test.rb diff --git a/src/lib/network/edit_nic_name.rb b/src/lib/network/edit_nic_name.rb deleted file mode 100644 index b97263220..000000000 --- a/src/lib/network/edit_nic_name.rb +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require "yast" - -module Yast - Yast.import "UI" - Yast.import "LanItems" - Yast.import "Popup" - - # The class represents a simple dialog which allows user to input new NIC - # name. It also allows to select a device attribute (MAC, Bus id, ...) which will - # be used for device selection. - class EditNicName - include UIShortcuts - include I18n - - # @return [String] current udev name before modifying it - attr_reader :old_name - # @return [String] current udev match criteria - attr_reader :old_key - - # Constructor - # - # @param settings [Y2Network::InterfaceConfigBuilder] Interface configuration - def initialize(settings) - textdomain "network" - @settings = settings - interface = settings.interface - @old_name = interface.name - @old_key = interface.renaming_mechanism - @mac = interface.hardware.mac - @bus_id = interface.hardware.busid - end - - # Opens dialog for editing NIC name and runs event loop. - # - # @return [String] new NIC name - def run - open - - ret = nil - until [:cancel, :abort, :ok].include? ret - ret = UI.UserInput - - next if ret != :ok - - new_name = UI.QueryWidget(:dev_name, :Value) - udev_type = UI.QueryWidget(:udev_type, :CurrentButton) - - if CheckUdevNicName(new_name) - @settings.rename_interface(new_name, udev_type) - else - UI.SetFocus(:dev_name) - ret = nil - - next - end - end - - close - - new_name || old_name - end - - private - - # Opens dialog for editing NIC name - def open - UI.OpenDialog( - VBox( - Left( - HBox( - Label(_("Device Name:")), - InputField(Id(:dev_name), Opt(:hstretch), "", old_name) - ) - ), - VSpacing(0.5), - Frame( - _("Base Udev Rule On"), - RadioButtonGroup( - Id(:udev_type), - VBox( - # make sure there is enough space (#367239) - HSpacing(30), - Left( - RadioButton( - Id(:mac), - _("MAC address: %s") % @mac - ) - ), - Left( - RadioButton( - Id(:bus_id), - _("BusID: %s") % @bus_id - ) - ) - ) - ) - ), - VSpacing(0.5), - HBox( - PushButton(Id(:ok), Opt(:default), Label.OKButton), - PushButton(Id(:cancel), Label.CancelButton) - ) - ) - ) - - if old_key - UI.ChangeWidget(Id(:udev_type), :CurrentButton, old_key) - else - Builtins.y2error("Unknown udev rule.") - end - end - - # Closes the dialog - def close - UI.CloseDialog - end - - # Checks if given name can be accepted as nic's new one. - # - # Pops up an explanation if the name is invalid - # - # @return [boolean] false if name is invalid - def CheckUdevNicName(name) - # check if the name is assigned to another device already - if @settings.name_exists?(name) - Popup.Error(_("Configuration name already exists.")) - return false - end - - if !@settings.valid_name?(name) - Popup.Error(_("Invalid configuration name.")) - return false - end - - true - end - - # When an interface name has changed, it returns whether the user wants to - # update the interface name in the related routes or not. - # - # return [Boolean] whether the routes have to be updated or not - def update_routes?(previous_name) - return false unless Routing.device_routes?(previous_name) - - Popup.YesNoHeadline( - Label.WarningMsg, - # TRANSLATORS: Ask for fixing a possible conflict after renaming - # an interface, %s are the previous and current interface names - format(_("The interface %s has been renamed to %s. There are \n" \ - "some routes that still use the previous name.\n\n" \ - "Would you like to update them now?\n"), - "'#{previous_name}'", - "'#{LanItems.current_name}'") - ) - end - end -end diff --git a/test/network/edit_nic_name_test.rb b/test/network/edit_nic_name_test.rb deleted file mode 100755 index 1e842e6a4..000000000 --- a/test/network/edit_nic_name_test.rb +++ /dev/null @@ -1,180 +0,0 @@ -#!/usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "../test_helper" - -require "yast" -require "network/edit_nic_name" - -require "y2network/route" -require "y2network/routing" -require "y2network/routing_table" -require "y2network/interfaces_collection" -require "y2network/interface" -require "y2network/interface_config_builder" -require "y2network/config" - -Yast.import "LanItems" - -describe Yast::EditNicName do - let(:subject) { described_class.new(builder) } - let(:current_name) { "spec0" } - let(:new_name) { "new1" } - let(:existing_new_name) { "existing_new_name" } - let(:interface_hwinfo) { { "dev_name" => current_name, "permanent_mac" => "00:01:02:03:04:05" } } - - let(:route1) { Y2Network::Route.new } - let(:table1) { Y2Network::RoutingTable.new(routes: [route1]) } - let(:routing) { Y2Network::Routing.new(tables: table1) } - let(:iface) { Y2Network::Interface.new(current_name) } - let(:ifaces) { Y2Network::InterfacesCollection.new([iface]) } - let(:yast_config) do - Y2Network::Config.new(interfaces: ifaces, routing: routing, source: :sysconfig) - end - let(:builder) do - instance_double(Y2Network::InterfaceConfigBuilder, interface: iface, - name_exists?: false, valid_name?: true, rename_interface: nil) - end - - before do - allow(Y2Network::Config).to receive(:find).and_return(yast_config) - end - - describe "#run" do - # general mocking stuff is placed here - before(:each) do - # NetworkInterfaces are too low level. Everything needed should be mocked - stub_const("NetworkInterfaces", double(adapt_old_config!: nil)) - - # mock devices configuration - allow(Yast::LanItems).to receive(:ReadHardware).and_return([interface_hwinfo]) - allow(Yast::LanItems).to receive(:getNetworkInterfaces).and_return([current_name]) - allow(Yast::LanItems).to receive(:GetItemUdev) { "" } - allow(Yast::LanItems).to receive(:current_udev_name).and_return(current_name) - allow(Yast::LanItems).to receive(:GetItemUdev).with("ATTR{address}") { "00:01:02:03:04:05" } - allow(Yast::LanItems).to receive(:GetNetcardNames).and_return([current_name]) - - # LanItems initialization - - Yast::LanItems.Read - Yast::LanItems.FindAndSelect(current_name) - end - - context "when closed without any change" do - before(:each) do - # emulate Yast::UI work - allow(Yast::UI).to receive(:QueryWidget).with(:dev_name, :Value) { current_name } - allow(Yast::UI).to receive(:QueryWidget).with(:udev_type, :CurrentButton) { :mac } - allow(Yast::UI).to receive(:UserInput) { :ok } - allow(Yast::LanItems).to receive(:update_item_udev_rule!) - end - - it "returns current name when used Ok button" do - expect(subject.run).to be_equal current_name - end - - it "returns current name when used Cancel button" do - allow(Yast::UI).to receive(:UserInput) { :cancel } - - expect(subject.run).to be_equal current_name - end - end - - context "when name changed" do - before(:each) do - # emulate Yast::UI work - allow(Yast::UI).to receive(:QueryWidget).with(:dev_name, :Value) { new_name } - allow(Yast::UI).to receive(:QueryWidget).with(:udev_type, :CurrentButton) { :mac } - allow(Yast::UI).to receive(:UserInput) { :ok } - allow(subject).to receive(:update_routes?).and_return(false) - end - - context "and closed confirming the changes" do - it "returns the new name" do - expect(subject.run).to be_equal new_name - end - - it "asks for new user input when name already exists" do - allow(Yast::UI).to receive(:QueryWidget) - .with(:dev_name, :Value).and_return(existing_new_name, new_name) - allow(subject).to receive(:CheckUdevNicName).with(existing_new_name).and_return(false) - allow(subject).to receive(:CheckUdevNicName).with(new_name).and_return(true) - allow(Yast::UI).to receive(:SetFocus) - expect(builder).to receive(:rename_interface).with(new_name, :mac) - subject.run - end - - context "but used the same matching udev key" do - it "does not touch the current udev rule" do - expect(Yast::LanItems).to_not receive(:update_item_udev_rule!) - end - end - - xcontext "and there are some routes referencing the previous name" do - before do - allow(Yast::Routing).to receive(:device_routes?).with(current_name).and_return(true) - expect(subject).to receive(:update_routes?).with(current_name).and_call_original - allow(Yast::LanItems).to receive(:update_routes!).with(current_name) - end - - it "asks the user about updating the routes device name" do - expect(Yast::Popup).to receive(:YesNoHeadline) - - subject.run - end - - it "updates the routes if the user accepts to do it" do - expect(Yast::Popup).to receive(:YesNoHeadline).and_return(true) - expect(Yast::LanItems).to receive(:update_routes!).with(current_name) - - subject.run - end - - it "does not touch the routes if the user does not want to touch them" do - expect(Yast::Popup).to receive(:YesNoHeadline).and_return(false) - expect(Yast::LanItems).to_not receive(:update_routes!) - subject.run - end - end - - context "having modified the matching udev key" do - before(:each) do - # emulate UI work - allow(Yast::UI).to receive(:QueryWidget).with(:dev_name, :Value) { current_name } - allow(Yast::UI).to receive(:QueryWidget).with(:udev_type, :CurrentButton) { :bus_id } - end - - it "updates the current udev rule with the key used" do - expect(Yast::LanItems).to_not receive(:update_item_udev_rule!).with(:bus_id) - end - end - end - - context "and closed canceling the changes" do - it "returns current name when used Cancel button" do - allow(Yast::UI).to receive(:UserInput) { :cancel } - - expect(subject.run).to be_equal current_name - end - end - end - end -end From 8df6d53cb50fca5e9969f120b08084adb2254238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 27 Aug 2019 15:37:20 +0100 Subject: [PATCH 231/471] Add a call to udevadm settle --- src/lib/y2network/sysconfig/interfaces_writer.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index d79a7aa1b..8bf6ada9d 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -58,6 +58,11 @@ def udev_rule_for(iface) def update_udevd Yast::Execute.on_target("/usr/bin/udevadm", "control", "--reload") Yast::Execute.on_target("/usr/bin/udevadm", "trigger", "--subsystem-match=net", "--action=add") + # wait so that ifcfgs written in NetworkInterfaces are newer + # (1-second-wise) than netcontrol status files, + # and rcnetwork reload actually works (bnc#749365) + Yast::Execute.on_target("/usr/bin/udevadm", "settle") + sleep(1) end end end From 53e75d06b8258f0b592cf2f28b82a81e7900acf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 27 Aug 2019 15:49:13 +0100 Subject: [PATCH 232/471] Fix and improve renaming udev rules --- src/lib/y2network/udev_rule.rb | 14 +++++++++++--- test/y2network/sysconfig/interfaces_writer_test.rb | 6 ++++-- test/y2network/udev_rule_test.rb | 7 ++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 7d7bcd416..80ec96edb 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -53,7 +53,15 @@ def find_for(device) # @param mac [String] MAC address def new_mac_based_rename(name, mac) new_network_rule( - [UdevRulePart.new("ATTR{address}", "=", mac), UdevRulePart.new("NAME", "=", name)] + [ + # Guard to not try to rename everything with the same MAC address (e.g. vlan devices + # inherit the MAC address from the underlying device). + UdevRulePart.new("KERNEL", "==", "eth*"), + # The port number of a NIC where the ports share the same hardware device. + UdevRulePart.new("ATTR{dev_id}", "==", "0x0"), + UdevRulePart.new("ATTR{address}", "==", mac), + UdevRulePart.new("NAME", "=", name) + ] ) end @@ -63,8 +71,8 @@ def new_mac_based_rename(name, mac) # @param bus_id [String] BUS ID (e.g., "0000:08:00.0") # @param dev_port [String] Device port def new_bus_id_based_rename(name, bus_id, dev_port = nil) - parts = [UdevRulePart.new("KERNELS", "=", bus_id)] - parts << UdevRulePart.new("ATTR{dev_port}", "=", dev_port) if dev_port + parts = [UdevRulePart.new("KERNELS", "==", bus_id)] + parts << UdevRulePart.new("ATTR{dev_port}", "==", dev_port) if dev_port parts << UdevRulePart.new("NAME", "=", name) new_network_rule(parts) end diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index f95d6a843..e6a036d81 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -48,7 +48,8 @@ expect(Y2Network::UdevRule).to receive(:write) do |rules| expect(rules.first.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ - "ATTR{type}==\"1\", ATTR{address}=\"01:23:45:67:89:ab\", NAME=\"eth0\"" + "ATTR{type}==\"1\", KERNEL==\"eth*\", ATTR{dev_id}==\"0x0\", " \ + "ATTR{address}==\"01:23:45:67:89:ab\", NAME=\"eth0\"" ) end subject.write(interfaces) @@ -62,7 +63,7 @@ expect(Y2Network::UdevRule).to receive(:write) do |rules| expect(rules.first.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ - "ATTR{type}==\"1\", KERNELS=\"00:1c.0\", ATTR{dev_port}=\"1\", NAME=\"eth0\"" + "ATTR{type}==\"1\", KERNELS==\"00:1c.0\", ATTR{dev_port}==\"1\", NAME=\"eth0\"" ) end subject.write(interfaces) @@ -83,6 +84,7 @@ it "refreshes udev" do expect(Yast::Execute).to receive(:on_target).with("/usr/bin/udevadm", "control", any_args) expect(Yast::Execute).to receive(:on_target).with("/usr/bin/udevadm", "trigger", any_args) + expect(Yast::Execute).to receive(:on_target).with("/usr/bin/udevadm", "settle") subject.write(interfaces) end end diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index a24536d05..ee177955e 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -58,7 +58,8 @@ rule = described_class.new_mac_based_rename("eth0", "01:23:45:67:89:ab") expect(rule.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{type}==\"1\", " \ - "ATTR{address}=\"01:23:45:67:89:ab\", NAME=\"eth0\"" + "KERNEL==\"eth*\", ATTR{dev_id}==\"0x0\", ATTR{address}==\"01:23:45:67:89:ab\", " \ + "NAME=\"eth0\"" ) end end @@ -68,7 +69,7 @@ rule = described_class.new_bus_id_based_rename("eth0", "0000:08:00.0", "1") expect(rule.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{type}==\"1\", " \ - "KERNELS=\"0000:08:00.0\", ATTR{dev_port}=\"1\", NAME=\"eth0\"" + "KERNELS==\"0000:08:00.0\", ATTR{dev_port}==\"1\", NAME=\"eth0\"" ) end @@ -77,7 +78,7 @@ rule = described_class.new_bus_id_based_rename("eth0", "0000:08:00.0") expect(rule.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{type}==\"1\", " \ - "KERNELS=\"0000:08:00.0\", NAME=\"eth0\"" + "KERNELS==\"0000:08:00.0\", NAME=\"eth0\"" ) end end From 27d43a690006af4ca8296be5cad9770dce449a05 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 28 Aug 2019 09:57:34 +0200 Subject: [PATCH 233/471] use type from data if provided --- src/lib/y2network/sysconfig/interfaces_reader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index bd56d46ea..bc4c3226d 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -119,7 +119,7 @@ def build_physical_interface(data) Y2Network::PhysicalInterface.new(data["dev_name"]).tap do |iface| iface.description = data["name"] iface.renaming_mechanism = renaming_mechanism_for(iface.name) - iface.type = TypeDetector.type_of(iface.name) + iface.type = InterfaceType.from_short_name(data["type"]) || TypeDetector.type_of(iface.name) end end From c1a949c619df37dc47aec5110eb17a25bcf5f97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 28 Aug 2019 12:31:38 +0100 Subject: [PATCH 234/471] Add an InterfaceFile#remove method --- src/lib/y2network/sysconfig/interface_file.rb | 6 ++++++ test/y2network/sysconfig/interface_file_test.rb | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 7c01817d3..c46723ccd 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -386,6 +386,12 @@ def clean @defined_variables = nil end + # Removes the file + def remove + return unless Yast::FileUtils.Exists(path.to_s) + Yast::SCR.Execute(Yast::Path.new(".target.remove"), path.to_s) + end + private # Determines the Interface type based on specific values diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 531c34f9b..498fc8b9d 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -56,6 +56,16 @@ def file_content(scr_root, file) end end + describe "#remove" do + subject(:file) { described_class.find("eth0") } + + it "removes the file" do + expect(file).to_not be_nil + file.remove + expect(File).to_not exist(File.join(scr_root, file.path)) + end + end + describe "#ipaddrs" do it "returns the IP addresses" do expect(file.ipaddrs).to eq( From bba5725b05c7a5f42662626bf1eaaefc151116b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 28 Aug 2019 12:44:27 +0100 Subject: [PATCH 235/471] Remove old configuration files when renaming --- src/lib/y2network/interface.rb | 3 + .../y2network/sysconfig/interfaces_writer.rb | 36 ++++++-- src/lib/y2network/sysconfig/routes_file.rb | 9 ++ .../sysconfig/interfaces_writer_test.rb | 83 ++++++++++++++----- 4 files changed, 106 insertions(+), 25 deletions(-) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index ab1de2c63..56f0b6b4d 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -50,6 +50,8 @@ class Interface attr_reader :hardware # @return [Symbol] Mechanism to rename the interface (nil -no rename-, :bus_id or :mac) attr_accessor :renaming_mechanism + # @return [String,nil] + attr_reader :old_name # Shortcuts for accessing interfaces' ifcfg options # @@ -116,6 +118,7 @@ def drivers # @param mechanism [Symbol] Property to base the rename on (:mac or :bus_id) def rename(new_name, mechanism) log.info "Rename interface '#{name}' to '#{new_name}' using the '#{mechanism}'" + @old_name = name @name = new_name @renaming_mechanism = mechanism end diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 8bf6ada9d..d2705a5c9 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -20,6 +20,10 @@ require "yast" require "y2network/udev_rule" require "yast2/execute" +require "y2network/sysconfig/interface_file" +require "y2network/sysconfig/routes_file" + +Yast.import "Mode" module Y2Network module Sysconfig @@ -34,9 +38,8 @@ class InterfacesWriter # # @param interfaces [Y2Network::InterfacesCollection] Interfaces collection def write(interfaces) - udev_rules = interfaces.map { |i| udev_rule_for(i) }.compact - Y2Network::UdevRule.write(udev_rules) - update_udevd + clean_up_old_interfaces(interfaces) + update_udevd(interfaces) end private @@ -54,8 +57,13 @@ def udev_rule_for(iface) end end - # Refreshes udev service - def update_udevd + # Renames interfaces and refresh the udev service + # + # @param [InterfaceCollection] Interfaces + def update_udevd(interfaces) + udev_rules = interfaces.map { |i| udev_rule_for(i) }.compact + Y2Network::UdevRule.write(udev_rules) + Yast::Execute.on_target("/usr/bin/udevadm", "control", "--reload") Yast::Execute.on_target("/usr/bin/udevadm", "trigger", "--subsystem-match=net", "--action=add") # wait so that ifcfgs written in NetworkInterfaces are newer @@ -64,6 +72,24 @@ def update_udevd Yast::Execute.on_target("/usr/bin/udevadm", "settle") sleep(1) end + + # Cleans and shutdowns renamed interfaces + # + # @param interfaces [InterfacesCollection] Interfaces + def clean_up_old_interfaces(interfaces) + interfaces.to_a.select(&:old_name).each do |iface| + set_interface_down(iface.old_name) + Y2Network::Sysconfig::InterfaceFile.find(iface.old_name)&.remove + Y2Network::Sysconfig::RoutesFile.find(iface.old_name)&.remove + end + end + + # Sets the interface down + # + # @param iface_name [String] Interface's name + def set_interface_down(iface_name) + Yast::Execute.on_target("/sbin/ifdown", iface_name) unless Yast::Mode.autoinst + end end end end diff --git a/src/lib/y2network/sysconfig/routes_file.rb b/src/lib/y2network/sysconfig/routes_file.rb index 9009018c1..cdaf7325c 100644 --- a/src/lib/y2network/sysconfig/routes_file.rb +++ b/src/lib/y2network/sysconfig/routes_file.rb @@ -39,6 +39,7 @@ module Sysconfig # file.routes.size #=> 1 class RoutesFile DEFAULT_ROUTES_FILE = "/etc/sysconfig/network/routes".freeze + SYSCONFIG_NETWORK_DIR = "/etc/sysconfig/network".freeze # @return [Array] Routes attr_accessor :routes @@ -46,6 +47,14 @@ class RoutesFile # @return [String] File path attr_reader :file_path + class << self + # @param interface [String] Interface's name + def find(interface) + file_path = File.join(SYSCONFIG_NETWORK_DIR, "ifroute-#{interface}") + new(file_path) + end + end + # @param file_path [String] File path def initialize(file_path = DEFAULT_ROUTES_FILE) @register_agent = file_path != DEFAULT_ROUTES_FILE diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index e6a036d81..aadc1b833 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -22,6 +22,7 @@ require "y2network/udev_rule" require "y2network/physical_interface" require "y2network/interfaces_collection" +require "tmpdir" describe Y2Network::Sysconfig::InterfacesWriter do subject(:writer) { described_class.new } @@ -35,38 +36,80 @@ instance_double(Y2Network::Hwinfo, busid: "00:1c.0", mac: "01:23:45:67:89:ab", dev_port: "1") end let(:renaming_mechanism) { nil } + let(:scr_root) { Dir.mktmpdir } before do allow(Yast::Execute).to receive(:on_target) allow(eth0).to receive(:hardware).and_return(hardware) end - context "when the interface is renamed using the MAC" do - let(:renaming_mechanism) { :mac } + around do |example| + begin + FileUtils.cp_r(File.join(DATA_PATH, "scr_read", "etc"), scr_root) + change_scr_root(scr_root, &example) + ensure + FileUtils.remove_entry(scr_root) + end + end - it "writes a MAC based udev renaming rule" do - expect(Y2Network::UdevRule).to receive(:write) do |rules| - expect(rules.first.to_s).to eq( - "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ - "ATTR{type}==\"1\", KERNEL==\"eth*\", ATTR{dev_id}==\"0x0\", " \ - "ATTR{address}==\"01:23:45:67:89:ab\", NAME=\"eth0\"" - ) - end + context "when the interface is renamed" do + before do + eth0.rename("eth1", renaming_mechanism) + end + + it "removes the old configuration files" do + ifcfg_path = File.join(scr_root, "etc", "sysconfig", "network", "ifcfg-eth0") + ifroute_path = File.join(scr_root, "etc", "sysconfig", "network", "ifroute-eth0") + expect(File).to exist(ifcfg_path) + expect(File).to exist(ifroute_path) subject.write(interfaces) + expect(File).to_not exist(ifcfg_path) + expect(File).to_not exist(ifroute_path) end - end - context "when the interface is renamed using the BUS ID" do - let(:renaming_mechanism) { :bus_id } + it "sets the interface down" do + expect(Yast::Execute).to receive(:on_target).with("/sbin/ifdown", "eth0") + subject.write(interfaces) + end - it "writes a BUS ID based udev renaming rule" do - expect(Y2Network::UdevRule).to receive(:write) do |rules| - expect(rules.first.to_s).to eq( - "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ - "ATTR{type}==\"1\", KERNELS==\"00:1c.0\", ATTR{dev_port}==\"1\", NAME=\"eth0\"" - ) + context "during autoinstallation" do + before do + allow(Yast::Mode).to receive(:autoinst).and_return(true) + end + + it "does not set the interface down" do + expect(Yast::Execute).to_not receive(:on_target).with("/sbin/ifdown", any_args) + subject.write(interfaces) + end + end + + context "when the interface is renamed using the MAC" do + let(:renaming_mechanism) { :mac } + + it "writes a MAC based udev renaming rule" do + expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(rules.first.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ + "ATTR{type}==\"1\", KERNEL==\"eth*\", ATTR{dev_id}==\"0x0\", " \ + "ATTR{address}==\"01:23:45:67:89:ab\", NAME=\"eth1\"" + ) + end + subject.write(interfaces) + end + end + + context "when the interface is renamed using the BUS ID" do + let(:renaming_mechanism) { :bus_id } + + it "writes a BUS ID based udev renaming rule" do + expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(rules.first.to_s).to eq( + "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ + "ATTR{type}==\"1\", KERNELS==\"00:1c.0\", ATTR{dev_port}==\"1\", NAME=\"eth1\"" + ) + end + subject.write(interfaces) end - subject.write(interfaces) end end From 8ef72a63dc10c8a77ca7d09f3a7ce0dba9c0f233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 28 Aug 2019 12:47:18 +0100 Subject: [PATCH 236/471] Disables de "KERNEL==" part of the udev rules * It causes problem with predictable network names. * Keeping the old behaviour until we find a better way to handle this. --- src/lib/y2network/udev_rule.rb | 3 ++- test/y2network/sysconfig/interfaces_writer_test.rb | 2 +- test/y2network/udev_rule_test.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 80ec96edb..79380d290 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -56,7 +56,8 @@ def new_mac_based_rename(name, mac) [ # Guard to not try to rename everything with the same MAC address (e.g. vlan devices # inherit the MAC address from the underlying device). - UdevRulePart.new("KERNEL", "==", "eth*"), + # FIXME: it won't work when using predictable network names (openSUSE) + # UdevRulePart.new("KERNEL", "==", "eth*"), # The port number of a NIC where the ports share the same hardware device. UdevRulePart.new("ATTR{dev_id}", "==", "0x0"), UdevRulePart.new("ATTR{address}", "==", mac), diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index aadc1b833..ff271fb95 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -90,7 +90,7 @@ expect(Y2Network::UdevRule).to receive(:write) do |rules| expect(rules.first.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ - "ATTR{type}==\"1\", KERNEL==\"eth*\", ATTR{dev_id}==\"0x0\", " \ + "ATTR{type}==\"1\", ATTR{dev_id}==\"0x0\", " \ "ATTR{address}==\"01:23:45:67:89:ab\", NAME=\"eth1\"" ) end diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index ee177955e..46404fb39 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -58,7 +58,7 @@ rule = described_class.new_mac_based_rename("eth0", "01:23:45:67:89:ab") expect(rule.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{type}==\"1\", " \ - "KERNEL==\"eth*\", ATTR{dev_id}==\"0x0\", ATTR{address}==\"01:23:45:67:89:ab\", " \ + "ATTR{dev_id}==\"0x0\", ATTR{address}==\"01:23:45:67:89:ab\", " \ "NAME=\"eth0\"" ) end From 76503b8c5a64605445491ebf851979bd0d8f4624 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 28 Aug 2019 16:46:14 +0200 Subject: [PATCH 237/471] initial version of table based on new backend --- src/include/network/lan/complex.rb | 59 +++++++-------- src/lib/y2network/widgets/add_interface.rb | 43 +++++++++++ src/lib/y2network/widgets/delete_interface.rb | 58 ++++++++++++++ src/lib/y2network/widgets/edit_interface.rb | 52 +++++++++++++ src/lib/y2network/widgets/interfaces_table.rb | 75 +++++++++++++++++++ 5 files changed, 256 insertions(+), 31 deletions(-) create mode 100644 src/lib/y2network/widgets/add_interface.rb create mode 100644 src/lib/y2network/widgets/delete_interface.rb create mode 100644 src/lib/y2network/widgets/edit_interface.rb create mode 100644 src/lib/y2network/widgets/interfaces_table.rb diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index f38533b86..df1738157 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -1,4 +1,4 @@ -# , :gw6dev encoding: utf-8 +# encoding: utf-8 # *************************************************************************** # @@ -29,6 +29,10 @@ require "y2network/interface_config_builder" require "y2network/sequences/interface" +require "y2network/widgets/interfaces_table" +require "y2network/widgets/add_interface" +require "y2network/widgets/edit_interface" +require "y2network/widgets/delete_interface" module Yast module NetworkLanComplexInclude @@ -69,34 +73,11 @@ def wd @wd = { "MANAGED" => managed_widget, "IPV6" => ipv6_widget, - "OVERVIEW" => { - "widget" => :custom, - "custom_widget" => VBox( - VWeight( - 2, - Table( - Id(:_hw_items), - Opt(:notify, :immediate), - Header(_("Name"), _("IP Address"), _("Device"), _("Note")) - ) - ), - VWeight(1, RichText(Id(:_hw_sum), "")), - HBox( - *overview_buttons.map { |k, v| PushButton(Id(k), v) }, - HStretch() - ) - ), - "init" => fun_ref(method(:initOverview), "void (string)"), - "handle" => fun_ref( - method(:handleOverview), - "symbol (string, map)" - ), - "help" => Ops.get_string( - @help, - "overview", - "" - ) - } + interfaces_table.widget_id => interfaces_table.cwm_definition, + add_interface.widget_id => add_interface.cwm_definition, + edit_interface.widget_id => edit_interface.cwm_definition, + delete_interface.widget_id => delete_interface.cwm_definition + # TODO: hardware summary richtext } @wd = Convert.convert( @@ -132,14 +113,30 @@ def tabs_descr }, "overview" => { "header" => _("Overview"), - "contents" => VBox("OVERVIEW"), - "widget_names" => ["OVERVIEW"] + "contents" => VBox(interfaces_table.widget_id, Left(HBox(add_interface.widget_id, edit_interface.widget_id, delete_interface.widget_id))), + "widget_names" => [interfaces_table.widget_id, add_interface.widget_id, edit_interface.widget_id,delete_interface.widget_id] } } @tabs_descr = Builtins.union(@tabs_descr, route_td) @tabs_descr = Builtins.union(@tabs_descr, @dns_td) end + def interfaces_table + @interfaces_table ||= Y2Network::Widgets::InterfacesTable.new + end + + def add_interface + @add_interface ||= Y2Network::Widgets::AddInterface.new + end + + def edit_interface + @edit_interface ||= Y2Network::Widgets::EditInterface.new(interfaces_table) + end + + def delete_interface + @delete_interface ||= Y2Network::Widgets::DeleteInterface.new(interfaces_table) + end + # Commit changes to internal structures # @return always `next def Commit(builder:) diff --git a/src/lib/y2network/widgets/add_interface.rb b/src/lib/y2network/widgets/add_interface.rb new file mode 100644 index 000000000..25506e722 --- /dev/null +++ b/src/lib/y2network/widgets/add_interface.rb @@ -0,0 +1,43 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm/common_widgets" +require "y2network/sequences/interface" + +Yast.import "Label" + +module Y2Network + module Widgets + class AddInterface < CWM::PushButton + def initialize + textdomain "network" + end + + def label + Yast::Label.AddButton + end + + def handle + Y2Network::Sequences::Interface.new.add + return :redraw + end + end + end +end diff --git a/src/lib/y2network/widgets/delete_interface.rb b/src/lib/y2network/widgets/delete_interface.rb new file mode 100644 index 000000000..9b356afbc --- /dev/null +++ b/src/lib/y2network/widgets/delete_interface.rb @@ -0,0 +1,58 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm/common_widgets" + +Yast.import "Label" +Yast.import "Lan" +Yast.import "Popup" + +module Y2Network + module Widgets + class DeleteInterface < CWM::PushButton + # @param table [InterfacesTable] + def initialize(table) + textdomain "network" + @table = table + end + + def label + Yast::Label.DeleteButton + end + + def handle + config = Yast::Lan.yast_config + connection_config = config.connections.by_name(@table.value) + if connection_config.startmode.name == "nfsroot" + if !Yast::Popup.YesNoHeadline( + Label.WarningMsg, + _("Device you select has STARTMODE=nfsroot. Really delete?") + ) + return nil + end + end + + config.connections.delete_if { |c| c.name == @table.value } + + :redraw + end + end + end +end diff --git a/src/lib/y2network/widgets/edit_interface.rb b/src/lib/y2network/widgets/edit_interface.rb new file mode 100644 index 000000000..25c14be55 --- /dev/null +++ b/src/lib/y2network/widgets/edit_interface.rb @@ -0,0 +1,52 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm/common_widgets" +require "y2network/sequences/interface" + +Yast.import "Label" +Yast.import "Lan" + +module Y2Network + module Widgets + class EditInterface < CWM::PushButton + # @param table [InterfacesTable] + def initialize(table) + textdomain "network" + + @table = table + end + + def label + Yast::Label.EditButton + end + + def handle + config = Yast::Lan.yast_config.copy + # TODO: handle unconfigured + connection_config = config.connections.by_name(@table.value) + builder = Y2Network::InterfaceConfigBuilder.for(connection_config.type, config: connection_config) + builder.name = connection_config.name + Y2Network::Sequences::Interface.new.edit(builder) + return :redraw + end + end + end +end diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb new file mode 100644 index 000000000..ce9c79263 --- /dev/null +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -0,0 +1,75 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm/table" + + +module Y2Network + module Widgets + class InterfacesTable < CWM::Table + def initialize + textdomain "network" + end + + def header + [ + _("Name"), + _("IP Address"), + _("Device"), + _("Note") + ] + end + + def items + # TODO: unconfigured devices + config = Yast::Lan.yast_config.copy + # TODO: handle unconfigured + config.connections.map do |conn| + [ + conn.name, # first is ID in table + conn.name, # TODO: better name based on hwinfo? + interface_protocol(conn), + conn.interface, + "" + ] + end + end + + # Workaround for usage in old CWM which also cache content of cwm items + def init + change_items(items) + end + + private + + def interface_protocol(connection) + return _("Not configured") if connection.nil? + + bootproto = connection.bootproto.name + + if bootproto == "static" + connection.ip.to_s + else + bootproto.upcase + end + end + end + end +end From cb0be81d843e5202ee1f66d7b4d1c458bae21deb Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 28 Aug 2019 17:00:04 +0200 Subject: [PATCH 238/471] make rubocop happy --- src/include/network/lan/complex.rb | 10 +++++----- src/lib/y2network/widgets/add_interface.rb | 2 +- src/lib/y2network/widgets/edit_interface.rb | 2 +- src/lib/y2network/widgets/interfaces_table.rb | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index df1738157..8ce4fd18d 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -71,11 +71,11 @@ def initialize_network_lan_complex(include_target) def wd return @wd if @wd @wd = { - "MANAGED" => managed_widget, - "IPV6" => ipv6_widget, + "MANAGED" => managed_widget, + "IPV6" => ipv6_widget, interfaces_table.widget_id => interfaces_table.cwm_definition, - add_interface.widget_id => add_interface.cwm_definition, - edit_interface.widget_id => edit_interface.cwm_definition, + add_interface.widget_id => add_interface.cwm_definition, + edit_interface.widget_id => edit_interface.cwm_definition, delete_interface.widget_id => delete_interface.cwm_definition # TODO: hardware summary richtext } @@ -114,7 +114,7 @@ def tabs_descr "overview" => { "header" => _("Overview"), "contents" => VBox(interfaces_table.widget_id, Left(HBox(add_interface.widget_id, edit_interface.widget_id, delete_interface.widget_id))), - "widget_names" => [interfaces_table.widget_id, add_interface.widget_id, edit_interface.widget_id,delete_interface.widget_id] + "widget_names" => [interfaces_table.widget_id, add_interface.widget_id, edit_interface.widget_id, delete_interface.widget_id] } } @tabs_descr = Builtins.union(@tabs_descr, route_td) diff --git a/src/lib/y2network/widgets/add_interface.rb b/src/lib/y2network/widgets/add_interface.rb index 25506e722..7df6882cb 100644 --- a/src/lib/y2network/widgets/add_interface.rb +++ b/src/lib/y2network/widgets/add_interface.rb @@ -36,7 +36,7 @@ def label def handle Y2Network::Sequences::Interface.new.add - return :redraw + :redraw end end end diff --git a/src/lib/y2network/widgets/edit_interface.rb b/src/lib/y2network/widgets/edit_interface.rb index 25c14be55..2b6ba9094 100644 --- a/src/lib/y2network/widgets/edit_interface.rb +++ b/src/lib/y2network/widgets/edit_interface.rb @@ -45,7 +45,7 @@ def handle builder = Y2Network::InterfaceConfigBuilder.for(connection_config.type, config: connection_config) builder.name = connection_config.name Y2Network::Sequences::Interface.new.edit(builder) - return :redraw + :redraw end end end diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index ce9c79263..2ae07279c 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -20,7 +20,6 @@ require "yast" require "cwm/table" - module Y2Network module Widgets class InterfacesTable < CWM::Table From 010b3d51aa1cbfa1b0eaa47a10aa7c145a1842b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 28 Aug 2019 16:00:18 +0100 Subject: [PATCH 239/471] Fix Hwinfo tests --- test/y2network/hwinfo_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 120c06370..373bd8df7 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -28,9 +28,10 @@ end let(:interface_name) { "enp1s0" } + let(:hw_wrapper) { double("Y2Network::HardwareWrapper", ReadHardware: hardware)} before do - allow(Yast::LanItems).to receive(:Hardware).and_return(hardware) + allow(Y2Network::HardwareWrapper).to receive(:new).and_return(hw_wrapper) allow(Y2Network::UdevRule).to receive(:find_for).with(interface_name).and_return(udev_rule) end From dbd43585e3e178de5c087790d6a80f7622070931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 28 Aug 2019 16:05:25 +0100 Subject: [PATCH 240/471] Update from code review --- src/lib/y2network/dialogs/rename_interface.rb | 7 ++++--- src/lib/y2network/hwinfo.rb | 7 ++++--- src/lib/y2network/widgets/custom_interface_name.rb | 12 ++++-------- src/lib/y2network/widgets/rename_hwinfo.rb | 10 +++------- test/y2network/dialogs/rename_interface_test.rb | 4 ++-- test/y2network/widgets/rename_hwinfo_test.rb | 6 +++--- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/lib/y2network/dialogs/rename_interface.rb b/src/lib/y2network/dialogs/rename_interface.rb index 379085c4a..5350e4e2b 100644 --- a/src/lib/y2network/dialogs/rename_interface.rb +++ b/src/lib/y2network/dialogs/rename_interface.rb @@ -20,6 +20,7 @@ require "cwm/popup" require "y2network/widgets/custom_interface_name" require "y2network/widgets/rename_hwinfo" +require "y2network/virtual_interface" module Y2Network module Dialogs @@ -46,9 +47,9 @@ def initialize(builder) def run ret = super return unless ret == :ok - renaming_mechanism = rename_hwinfo_widget.value unless virtual_interface? - @builder.rename_interface(name_widget.value, renaming_mechanism) - name_widget.value + renaming_mechanism = rename_hwinfo_widget.result unless virtual_interface? + @builder.rename_interface(name_widget.result, renaming_mechanism) + name_widget.result end # @see CWM::CustomWidget diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index a6988e325..7f2f0f54b 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -59,7 +59,8 @@ def for(name) # @param name [String] Interface's name # @return [Hwinfo,nil] Hardware info or nil if not found def hwinfo_from_hardware(name) - hw = Yast::LanItems.Hardware.find { |h| h["dev_name"] == name } + netcards = HardwareWrapper.new.ReadHardware("netcard") + hw = netcards.find { |h| h["dev_name"] == name } return nil if hw.nil? raw_dev_port = Yast::SCR.Read( @@ -77,7 +78,7 @@ def hwinfo_from_hardware(name) # @return [Hwinfo,nil] Hardware info or nil if not found def hwinfo_from_udev(name) udev_rule = UdevRule.find_for(name) - return Hwinfo.new if udev_rule.nil? + return nil if udev_rule.nil? info = { udev: udev_rule.bus_id, mac: udev_rule.mac, @@ -92,7 +93,7 @@ def hwinfo_from_udev(name) # @param hwinfo [Hash] Hardware information def initialize(hwinfo = {}) # FIXME: store only what's needed. - @hwinfo = Hash[hwinfo.map { |k, v| [k.to_s, v] }] if hwinfo + @hwinfo = Hash[hwinfo.map { |k, v| [k.to_s, v] }] end # Shortcuts for accessing hwinfo items. Each hwinfo item has own method for reading diff --git a/src/lib/y2network/widgets/custom_interface_name.rb b/src/lib/y2network/widgets/custom_interface_name.rb index f8e8f898a..daa8816b2 100644 --- a/src/lib/y2network/widgets/custom_interface_name.rb +++ b/src/lib/y2network/widgets/custom_interface_name.rb @@ -25,6 +25,9 @@ module Y2Network module Widgets class CustomInterfaceName < CWM::InputField + # @return [String] Entered interface name + attr_reader :result + # Constructor # # @param builder [InterfaceConfigBuilder] Interface configuration builder object @@ -52,14 +55,7 @@ def init # Saves the current value so it can be queried after the widget is closed # @see CWM::AbstractWidget#init def store - @value = value - end - - # Current value - # - # @return [String,nil] - def value - @value || super + @result = value end # The value is valid when it does not contain unexpected characters diff --git a/src/lib/y2network/widgets/rename_hwinfo.rb b/src/lib/y2network/widgets/rename_hwinfo.rb index 33cba0a1c..3c5d08e8a 100644 --- a/src/lib/y2network/widgets/rename_hwinfo.rb +++ b/src/lib/y2network/widgets/rename_hwinfo.rb @@ -25,8 +25,8 @@ module Widgets # This class allows the user to select which hardware information # should be taken into account when renaming a device class RenameHwinfo < CWM::CustomWidget - # @return [Hwinfo,nil] Hardware information to consider - attr_reader :value + # @return [Symbol] Renaming mechanis + attr_reader :result # Constructor # @@ -49,11 +49,7 @@ def init # @see CWM::AbstractWidget def store - @value = current_value - end - - def value - @value ||= current_value + @result = current_value end # @see CWM::CustomWidget diff --git a/test/y2network/dialogs/rename_interface_test.rb b/test/y2network/dialogs/rename_interface_test.rb index 115788326..b702ca49f 100644 --- a/test/y2network/dialogs/rename_interface_test.rb +++ b/test/y2network/dialogs/rename_interface_test.rb @@ -66,8 +66,8 @@ allow(subject).to receive(:cwm_show).and_return(result) allow(Y2Network::Widgets::CustomInterfaceName).to receive(:new).and_return(name_widget) allow(Y2Network::Widgets::RenameHwinfo).to receive(:new).and_return(rename_hwinfo_widget) - allow(name_widget).to receive(:value).and_return(new_name) - allow(rename_hwinfo_widget).to receive(:value).and_return(rename_hwinfo) + allow(name_widget).to receive(:result).and_return(new_name) + allow(rename_hwinfo_widget).to receive(:result).and_return(rename_hwinfo) allow(interface).to receive(:hardware).and_return(hardware) end diff --git a/test/y2network/widgets/rename_hwinfo_test.rb b/test/y2network/widgets/rename_hwinfo_test.rb index db265437a..fa3e05e91 100644 --- a/test/y2network/widgets/rename_hwinfo_test.rb +++ b/test/y2network/widgets/rename_hwinfo_test.rb @@ -42,7 +42,7 @@ allow(subject).to receive(:current_value).and_return(mechanism) end - describe "#value" do + describe "#result" do before do subject.init subject.store @@ -50,7 +50,7 @@ context "when the MAC is selected as renaming method" do it "returns :mac as the renaming mechanism" do - selected_mechanism, = subject.value + selected_mechanism, = subject.result expect(selected_mechanism).to eq(:mac) end end @@ -59,7 +59,7 @@ let(:mechanism) { :bus_id } it "returns :bus_id as the renaming mechanism" do - selected_mechanism, = subject.value + selected_mechanism, = subject.result expect(selected_mechanism).to eq(:bus_id) end end From 8828a5ad9878050d9f1b74cf72bfdb0ea1771c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 07:16:21 +0100 Subject: [PATCH 241/471] Rename RenameHwinfo widget to RenamingMechanism --- .../widgets/{rename_hwinfo.rb => renaming_mechanism.rb} | 5 +++-- .../{rename_hwinfo_test.rb => renaming_mechanism_test.rb} | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename src/lib/y2network/widgets/{rename_hwinfo.rb => renaming_mechanism.rb} (95%) rename test/y2network/widgets/{rename_hwinfo_test.rb => renaming_mechanism_test.rb} (95%) diff --git a/src/lib/y2network/widgets/rename_hwinfo.rb b/src/lib/y2network/widgets/renaming_mechanism.rb similarity index 95% rename from src/lib/y2network/widgets/rename_hwinfo.rb rename to src/lib/y2network/widgets/renaming_mechanism.rb index 3c5d08e8a..3011c3124 100644 --- a/src/lib/y2network/widgets/rename_hwinfo.rb +++ b/src/lib/y2network/widgets/renaming_mechanism.rb @@ -19,13 +19,14 @@ require "yast" require "cwm" +require "cwm/custom_widget" module Y2Network module Widgets # This class allows the user to select which hardware information # should be taken into account when renaming a device - class RenameHwinfo < CWM::CustomWidget - # @return [Symbol] Renaming mechanis + class RenamingMechanism < CWM::CustomWidget + # @return [Symbol] Renaming mechanism attr_reader :result # Constructor diff --git a/test/y2network/widgets/rename_hwinfo_test.rb b/test/y2network/widgets/renaming_mechanism_test.rb similarity index 95% rename from test/y2network/widgets/rename_hwinfo_test.rb rename to test/y2network/widgets/renaming_mechanism_test.rb index fa3e05e91..6adffb24e 100644 --- a/test/y2network/widgets/rename_hwinfo_test.rb +++ b/test/y2network/widgets/renaming_mechanism_test.rb @@ -20,11 +20,11 @@ require_relative "../../test_helper" require "cwm/rspec" -require "y2network/widgets/rename_hwinfo" +require "y2network/widgets/renaming_mechanism" require "y2network/interface_config_builder" require "y2network/physical_interface" -describe Y2Network::Widgets::RenameHwinfo do +describe Y2Network::Widgets::RenamingMechanism do subject { described_class.new(builder) } let(:builder) do From ff9263b8c8723de5725533ff15d639b4f98dcbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 07:30:53 +0100 Subject: [PATCH 242/471] RenamingMechanism widget stores the selected value in the builder --- src/lib/y2network/interface_config_builder.rb | 7 ++--- .../y2network/widgets/renaming_mechanism.rb | 13 +++++---- .../interface_config_builder_test.rb | 28 ++++++++++++------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index b8811ac5c..2d8d85809 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -58,6 +58,8 @@ def self.for(type, config: nil) attr_accessor :name # @return [Y2Network::InterfaceType] type of @see Y2Network::Interface which is intended to be build attr_accessor :type + # @return [Symbol,nil] Mechanism to rename the interface (no hardware based, :mac or :bus_id) + attr_writer :renaming_mechanism # Constructor # @@ -120,12 +122,9 @@ def renamed_interface? # Renames the interface # # @param new_name [String] New interface's name - # @param renaming_mechanism [Symbol,nil] Mechanism to rename the interface - # (no hardware based, :mac or :bus_id) - def rename_interface(new_name, renaming_mechanism) + def rename_interface(new_name) @old_name ||= name self.name = new_name - @renaming_mechanism = renaming_mechanism end # Returns the current renaming mechanism diff --git a/src/lib/y2network/widgets/renaming_mechanism.rb b/src/lib/y2network/widgets/renaming_mechanism.rb index 3011c3124..1446f4a7d 100644 --- a/src/lib/y2network/widgets/renaming_mechanism.rb +++ b/src/lib/y2network/widgets/renaming_mechanism.rb @@ -43,14 +43,14 @@ def initialize(builder) @renaming_mechanism = builder.renaming_mechanism || :mac end - # @see CWM::AbstractWidget + # @see CWM::AbstractWidget#init def init Yast::UI.ChangeWidget(Id(:udev_type), :Value, @renaming_mechanism) end - # @see CWM::AbstractWidget + # @see CWM::AbstractWidget#store def store - @result = current_value + @builder.renaming_mechanism = value end # @see CWM::CustomWidget @@ -68,12 +68,13 @@ def contents ) end - private - - def current_value + # @see CWM::ValueBasedWidget#value + def value Yast::UI.QueryWidget(Id(:udev_type), :Value) end + private + def radio_buttons buttons = [] buttons << Left(RadioButton(Id(:mac), _("MAC address: %s") % @mac)) if @mac diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 74f389ed0..39778dc58 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -104,7 +104,8 @@ context "when interface was renamed" do before do - subject.rename_interface("eth2", :mac) + subject.rename_interface("eth2") + subject.renaming_mechanism = :mac end it "updates the name in the configuration" do @@ -214,14 +215,9 @@ describe "#rename_interface" do it "updates the interface name" do - expect { config_builder.rename_interface("eth2", :mac) } + expect { config_builder.rename_interface("eth2") } .to change { config_builder.name }.from("eth0").to("eth2") end - - it "updates the renaming mechanism" do - expect { config_builder.rename_interface("eth2", :mac) } - .to change { config_builder.renaming_mechanism }.from(nil).to(:mac) - end end describe "#renamed_interface?" do @@ -233,7 +229,17 @@ context "when the interface has been renamed" do before do - config_builder.rename_interface("eth2", :mac) + config_builder.rename_interface("eth2") + end + + it "returns true" do + expect(config_builder.renamed_interface?).to eq(true) + end + end + + context "when the renaming mechanism has been changed" do + before do + config_builder.renaming_mechanism = :busid end it "returns true" do @@ -243,11 +249,13 @@ context "when the old name and mechanism have been restored " do before do - config_builder.rename_interface("eth2", :mac) + config_builder.rename_interface("eth2") + config_builder.renaming_mechanism = :mac end it "returns false" do - config_builder.rename_interface("eth0", nil) + config_builder.rename_interface("eth0") + config_builder.renaming_mechanism = nil expect(config_builder.renamed_interface?).to eq(false) end end From b1d32410476d70860f8f75c693bb85cef4a2189b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 07:44:22 +0100 Subject: [PATCH 243/471] Simplify the dialog to rename an interface --- src/lib/y2network/dialogs/rename_interface.rb | 53 ++++------------ .../dialogs/rename_interface_test.rb | 60 +------------------ .../widgets/renaming_mechanism_test.rb | 13 ++-- 3 files changed, 20 insertions(+), 106 deletions(-) diff --git a/src/lib/y2network/dialogs/rename_interface.rb b/src/lib/y2network/dialogs/rename_interface.rb index 5350e4e2b..1a73d2189 100644 --- a/src/lib/y2network/dialogs/rename_interface.rb +++ b/src/lib/y2network/dialogs/rename_interface.rb @@ -19,55 +19,38 @@ require "cwm/popup" require "y2network/widgets/custom_interface_name" -require "y2network/widgets/rename_hwinfo" +require "y2network/widgets/renaming_mechanism" require "y2network/virtual_interface" module Y2Network module Dialogs # This dialog allows the user to rename a network interface # - # Is works in a slightly different way depending on the interface. - # - # * For physical interfaces, it allows the user to select between using - # the MAC adddress or the Bus ID, which are present in the Hwinfo object - # associated to the interface. - # * For not connected interfaces ({FakeInterface}), as the hardware is not present, - # the user must specify the MAC or the Bus ID by hand (NOT IMPLEMENTED YET). - # * For virtual interfaces, like bridges, only the name can be chaned (no hardware - # info at all) (NOT IMPLEMENTED YET). + # It allows the user to enter a new name and to select the attribute to + # base the rename on. Supported attributes are MAC address and Bus ID. class RenameInterface < CWM::Popup + # Constructor + # + # @param [Y2Network::InterfaceConfigBuilder] Interface configuration builder object def initialize(builder) textdomain "network" @builder = builder - @old_name = interface.name - end - - # Runs the dialog - def run - ret = super - return unless ret == :ok - renaming_mechanism = rename_hwinfo_widget.result unless virtual_interface? - @builder.rename_interface(name_widget.result, renaming_mechanism) - name_widget.result + @old_name = builder.interface.name end # @see CWM::CustomWidget def contents VBox( Left(name_widget), - *hardware_info + VSpacing(0.5), + rename_hwinfo_widget ) end private - # Elements to display the hardware information - def hardware_info - virtual_interface? ? [Empty()] : [VSpacing(0.5), rename_hwinfo_widget] - end - - # Interface's name widget + # Interface name widget # # @return [Y2Network::Widgets::CustomInterfaceName] def name_widget @@ -76,21 +59,9 @@ def name_widget # Widget to select the hardware information to base the rename on # - # @return [Y2Network::Widgets::RenameHwinfo] + # @return [Y2Network::Widgets::RenamingMechanism] def rename_hwinfo_widget - @rename_hwinfo_widget ||= Y2Network::Widgets::RenameHwinfo.new(@builder) - end - - # Returns the interface - # - # @return [Y2Network::Interface] - def interface - @builder.interface - end - - # Determines whether it is a virtual interface - def virtual_interface? - interface.is_a?(Y2Network::VirtualInterface) + @rename_hwinfo_widget ||= Y2Network::Widgets::RenamingMechanism.new(@builder) end end end diff --git a/test/y2network/dialogs/rename_interface_test.rb b/test/y2network/dialogs/rename_interface_test.rb index b702ca49f..0791cc98b 100644 --- a/test/y2network/dialogs/rename_interface_test.rb +++ b/test/y2network/dialogs/rename_interface_test.rb @@ -22,8 +22,6 @@ require "y2network/dialogs/rename_interface" require "y2network/interface_config_builder" -require "y2network/widgets/custom_interface_name" -require "y2network/widgets/rename_hwinfo" require "y2network/physical_interface" describe Y2Network::Dialogs::RenameInterface do @@ -34,65 +32,11 @@ builder.name = "eth0" end end - - let(:name_widget) do - Y2Network::Widgets::CustomInterfaceName.new(builder) - end - - let(:rename_hwinfo_widget) do - Y2Network::Widgets::RenameHwinfo.new(builder) - end - - let(:interface) do - Y2Network::PhysicalInterface.new("eth0") - end - - let(:hardware) do - Y2Network::Hwinfo.new(mac: "01:23:45:67:89:ab", busid: "0000:08:00.0") - end - - let(:rename_hwinfo) do - Y2Network::Hwinfo.new(mac: "01:23:45:67:89:ab") - end - - let(:new_name) { "eth1" } - - let(:result) { :ok } - - include_examples "CWM::Dialog" + let(:interface) { Y2Network::PhysicalInterface.new("eth0") } before do allow(builder).to receive(:interface).and_return(interface) - allow(subject).to receive(:cwm_show).and_return(result) - allow(Y2Network::Widgets::CustomInterfaceName).to receive(:new).and_return(name_widget) - allow(Y2Network::Widgets::RenameHwinfo).to receive(:new).and_return(rename_hwinfo_widget) - allow(name_widget).to receive(:result).and_return(new_name) - allow(rename_hwinfo_widget).to receive(:result).and_return(rename_hwinfo) - allow(interface).to receive(:hardware).and_return(hardware) end - describe "#run" do - before do - allow(Yast::UI).to receive(:UserInput).and_return(:ok) - end - - context "when the user accepts the change" do - let(:result) { :ok } - - it "renames the interface" do - expect(builder).to receive(:rename_interface) - .with(new_name, rename_hwinfo) - subject.run - end - end - - context "when the user clicks the cancel button" do - let(:result) { :cancel } - - it "doest not rename the interface" do - expect(builder).to_not receive(:rename_interface) - subject.run - end - end - end + include_examples "CWM::CustomWidget" end diff --git a/test/y2network/widgets/renaming_mechanism_test.rb b/test/y2network/widgets/renaming_mechanism_test.rb index 6adffb24e..dbe5f666e 100644 --- a/test/y2network/widgets/renaming_mechanism_test.rb +++ b/test/y2network/widgets/renaming_mechanism_test.rb @@ -39,19 +39,18 @@ before do allow(interface).to receive(:hardware).and_return(hwinfo) - allow(subject).to receive(:current_value).and_return(mechanism) + allow(subject).to receive(:value).and_return(mechanism) end - describe "#result" do + describe "#store" do before do subject.init - subject.store end context "when the MAC is selected as renaming method" do it "returns :mac as the renaming mechanism" do - selected_mechanism, = subject.result - expect(selected_mechanism).to eq(:mac) + expect(builder).to receive(:renaming_mechanism=).with(:mac) + subject.store end end @@ -59,8 +58,8 @@ let(:mechanism) { :bus_id } it "returns :bus_id as the renaming mechanism" do - selected_mechanism, = subject.result - expect(selected_mechanism).to eq(:bus_id) + expect(builder).to receive(:renaming_mechanism=).with(:bus_id) + subject.store end end end From dd5726eb8342fb25298570d05d8710b257ccb4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 07:55:22 +0100 Subject: [PATCH 244/471] Add an InterfaceNaming widget to hide the renaming details --- src/lib/y2network/widgets/general_tab.rb | 6 +- src/lib/y2network/widgets/interface_name.rb | 3 +- src/lib/y2network/widgets/interface_naming.rb | 57 +++++++++++++++++++ src/lib/y2network/widgets/udev_rules.rb | 17 ++---- .../widgets/interface_naming_test.rb | 42 ++++++++++++++ 5 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 src/lib/y2network/widgets/interface_naming.rb create mode 100644 test/y2network/widgets/interface_naming_test.rb diff --git a/src/lib/y2network/widgets/general_tab.rb b/src/lib/y2network/widgets/general_tab.rb index 1936cb309..9fd36a59d 100644 --- a/src/lib/y2network/widgets/general_tab.rb +++ b/src/lib/y2network/widgets/general_tab.rb @@ -21,8 +21,7 @@ require "cwm/tabs" # used widgets -require "y2network/widgets/interface_name" -require "y2network/widgets/udev_rules" +require "y2network/widgets/interface_naming" require "y2network/widgets/startmode" require "y2network/widgets/ifplugd_priority" require "y2network/widgets/firewall_zone" @@ -52,8 +51,7 @@ def contents 1, 0, VBox( - # FIXME: udev rules for anything without hwinfo is wrong - @settings.newly_added? ? InterfaceName.new(@settings) : UdevRules.new(@settings), + InterfaceNaming.new(@settings), Frame( _("Device Activation"), HBox(Startmode.new(@settings, ifplugd_widget), ifplugd_widget, HStretch()) diff --git a/src/lib/y2network/widgets/interface_name.rb b/src/lib/y2network/widgets/interface_name.rb index 771b76f90..a3eaa7671 100644 --- a/src/lib/y2network/widgets/interface_name.rb +++ b/src/lib/y2network/widgets/interface_name.rb @@ -79,7 +79,8 @@ def validate end def store - @settings.name = value + return if @settings.name == value + @settings.rename_interface(value) end end end diff --git a/src/lib/y2network/widgets/interface_naming.rb b/src/lib/y2network/widgets/interface_naming.rb new file mode 100644 index 000000000..af08889ae --- /dev/null +++ b/src/lib/y2network/widgets/interface_naming.rb @@ -0,0 +1,57 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "cwm/custom_widget" +require "y2network/widgets/udev_rules" +require "y2network/widgets/interface_name" + +module Y2Network + module Widgets + # Widget to handle interface naming, including udev based renames. + class InterfaceNaming < ::CWM::CustomWidget + # Constructor + # + # @param [Y2Network::InterfaceConfigBuilder] Interface configuration builder object + def initialize(builder) + @builder = builder + end + + # @see CWM::CustomWidget#contents + def contents + VBox(widget) + end + + private + + def udev_based_rename? + hardware = @builder.interface.hardware + return false unless hardware + !!(hardware.mac || hardware.busid) + end + + # Internal widget + # + # It uses an internal widget to handle the rename depending on whether + # udev based renames are needed or not. + def widget + @widget ||= udev_based_rename? ? UdevRules.new(@builder) : InterfaceName.new(@builder) + end + end + end +end diff --git a/src/lib/y2network/widgets/udev_rules.rb b/src/lib/y2network/widgets/udev_rules.rb index de8849ad8..ed089fcc1 100644 --- a/src/lib/y2network/widgets/udev_rules.rb +++ b/src/lib/y2network/widgets/udev_rules.rb @@ -36,7 +36,7 @@ def contents _("Udev Rules"), HBox( InputField(Id(:udev_rules_name), Opt(:hstretch, :disabled), _("Device Name"), ""), - @settings.interface.can_be_renamed? ? change_button : Empty() + PushButton(Id(:udev_rules_change), _("Change")) ) ) end @@ -46,15 +46,14 @@ def init end def handle - self.value = Y2Network::Dialogs::RenameInterface.new(@settings).run + dialog = Y2Network::Dialogs::RenameInterface.new(@settings) + ret = dialog.run + return unless ret == :ok + self.value = @settings.name nil end - def store - # TODO: nothing to do as done in RenameInterface which looks wrong - end - def value=(name) Yast::UI.ChangeWidget(Id(:udev_rules_name), :Value, name) end @@ -70,12 +69,6 @@ def help "example, eth1, wlan0 ) and assures a persistent device name upon reboot.\n" ) end - - private - - def change_button - PushButton(Id(:udev_rules_change), _("Change")) - end end end end diff --git a/test/y2network/widgets/interface_naming_test.rb b/test/y2network/widgets/interface_naming_test.rb new file mode 100644 index 000000000..944e5428b --- /dev/null +++ b/test/y2network/widgets/interface_naming_test.rb @@ -0,0 +1,42 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/interface_naming" +require "y2network/interface_config_builder" +require "y2network/physical_interface" + +describe Y2Network::Widgets::InterfaceNaming do + subject(:widget) { described_class.new(builder) } + + let(:builder) do + instance_double( + Y2Network::InterfaceConfigBuilder, + interface: interface + ) + end + + let(:interface) { instance_double(Y2Network::PhysicalInterface, hardware: nil) } + + include_examples "CWM::CustomWidget" + describe "#contents" + describe "#store" +end From fbb5df3112eabc93ef88f70cae1f0441cb4a539e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 07:57:40 +0100 Subject: [PATCH 245/471] Remove redundant CustomInterfaceName * Use the already existing InterfaceName. --- src/lib/y2network/dialogs/rename_interface.rb | 6 +- .../widgets/custom_interface_name.rb | 84 ------------------- .../widgets/custom_interface_name_test.rb | 79 ----------------- 3 files changed, 3 insertions(+), 166 deletions(-) delete mode 100644 src/lib/y2network/widgets/custom_interface_name.rb delete mode 100644 test/y2network/widgets/custom_interface_name_test.rb diff --git a/src/lib/y2network/dialogs/rename_interface.rb b/src/lib/y2network/dialogs/rename_interface.rb index 1a73d2189..bf43ac656 100644 --- a/src/lib/y2network/dialogs/rename_interface.rb +++ b/src/lib/y2network/dialogs/rename_interface.rb @@ -18,7 +18,7 @@ # find current contact information at www.suse.com. require "cwm/popup" -require "y2network/widgets/custom_interface_name" +require "y2network/widgets/interface_name" require "y2network/widgets/renaming_mechanism" require "y2network/virtual_interface" @@ -52,9 +52,9 @@ def contents # Interface name widget # - # @return [Y2Network::Widgets::CustomInterfaceName] + # @return [Y2Network::Widgets::InterfaceName] def name_widget - @name_widget ||= Y2Network::Widgets::CustomInterfaceName.new(@builder) + @name_widget ||= Y2Network::Widgets::InterfaceName.new(@builder) end # Widget to select the hardware information to base the rename on diff --git a/src/lib/y2network/widgets/custom_interface_name.rb b/src/lib/y2network/widgets/custom_interface_name.rb deleted file mode 100644 index daa8816b2..000000000 --- a/src/lib/y2network/widgets/custom_interface_name.rb +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require "cwm" -require "cwm/common_widgets" - -Yast.import "Popup" - -module Y2Network - module Widgets - class CustomInterfaceName < CWM::InputField - # @return [String] Entered interface name - attr_reader :result - - # Constructor - # - # @param builder [InterfaceConfigBuilder] Interface configuration builder object - def initialize(builder) - textdomain "network" - @builder = builder - @old_name = builder.name - end - - # @see CWM::AbstractWidget#label - def label - _("Device Name") - end - - # @see CWM::AbstractWidget#opt - def opt - [:hstretch] - end - - # @see CWM::AbstractWidget#init - def init - self.value = @builder.name - end - - # Saves the current value so it can be queried after the widget is closed - # @see CWM::AbstractWidget#init - def store - @result = value - end - - # The value is valid when it does not contain unexpected characters - # and it is not taken already. - # - # @return [Boolean] - # - # @see CWM::AbstractWidget#opt - # @see Y2Network::InterfaceConfigBuilder#name_exists? - # @see Y2Network::InterfaceConfigBuilder#valid_name? - def validate - if @old_name != value && @builder.name_exists?(value) - Yast::Popup.Error(_("Configuration name already exists.")) - return false - end - - if !@builder.valid_name?(value) - Yast::Popup.Error(_("Invalid configuration name.")) - return false - end - - true - end - end - end -end diff --git a/test/y2network/widgets/custom_interface_name_test.rb b/test/y2network/widgets/custom_interface_name_test.rb deleted file mode 100644 index e48921592..000000000 --- a/test/y2network/widgets/custom_interface_name_test.rb +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. -require_relative "../../test_helper" -require "cwm/rspec" - -require "y2network/widgets/custom_interface_name" -require "y2network/interface_config_builder" - -describe Y2Network::Widgets::CustomInterfaceName do - subject { described_class.new(builder) } - - let(:builder) do - instance_double( - Y2Network::InterfaceConfigBuilder, - name: "eth", - valid_name?: valid_name?, - name_exists?: name_exists? - ) - end - let(:valid_name?) { true } - let(:name_exists?) { false } - - include_examples "CWM::InputField" - - describe "#validate" do - - before do - allow(builder) - end - - context "when the name is valid" do - it "returns true" do - expect(subject.validate).to eq(true) - end - end - - context "when the name contains unexpected characters" do - let(:valid_name?) { false } - - it "returns false" do - expect(subject.validate).to eq(false) - end - - it "displays an error popup" do - expect(Yast::Popup).to receive(:Error).with(/Invalid configuration/) - subject.validate - end - end - - context "when the name is already taken" do - let(:name_exists?) { true } - - it "returns false" do - expect(subject.validate).to eq(false) - end - - it "displays an error popup" do - expect(Yast::Popup).to receive(:Error).with(/already exists/) - subject.validate - end - end - end -end From dd8b27f4571a1bb740c8e57db04ddb038587bbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 08:06:10 +0100 Subject: [PATCH 246/471] Make RuboCop happy --- src/lib/y2network/sysconfig/interfaces_writer.rb | 6 ++++-- test/y2network/hwinfo_test.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index d2705a5c9..8275fbff4 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -79,8 +79,10 @@ def update_udevd(interfaces) def clean_up_old_interfaces(interfaces) interfaces.to_a.select(&:old_name).each do |iface| set_interface_down(iface.old_name) - Y2Network::Sysconfig::InterfaceFile.find(iface.old_name)&.remove - Y2Network::Sysconfig::RoutesFile.find(iface.old_name)&.remove + ifcfg = Y2Network::Sysconfig::InterfaceFile.find(iface.old_name) + ifcfg && ifcfg.remove + ifroute = Y2Network::Sysconfig::RoutesFile.find(iface.old_name) + ifroute && ifroute.remove end end diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 373bd8df7..efca20b14 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -28,7 +28,7 @@ end let(:interface_name) { "enp1s0" } - let(:hw_wrapper) { double("Y2Network::HardwareWrapper", ReadHardware: hardware)} + let(:hw_wrapper) { double("Y2Network::HardwareWrapper", ReadHardware: hardware) } before do allow(Y2Network::HardwareWrapper).to receive(:new).and_return(hw_wrapper) From 3cc5d94e5f4ee024a02b53f95fca9763094e134d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 08:07:25 +0100 Subject: [PATCH 247/471] Minor documentation fixes --- src/lib/y2network/dialogs/rename_interface.rb | 2 +- src/lib/y2network/sysconfig/interfaces_writer.rb | 2 +- src/lib/y2network/widgets/interface_naming.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/dialogs/rename_interface.rb b/src/lib/y2network/dialogs/rename_interface.rb index bf43ac656..566985bab 100644 --- a/src/lib/y2network/dialogs/rename_interface.rb +++ b/src/lib/y2network/dialogs/rename_interface.rb @@ -31,7 +31,7 @@ module Dialogs class RenameInterface < CWM::Popup # Constructor # - # @param [Y2Network::InterfaceConfigBuilder] Interface configuration builder object + # @param builder [Y2Network::InterfaceConfigBuilder] Interface configuration builder object def initialize(builder) textdomain "network" diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 8275fbff4..8f6de043e 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -59,7 +59,7 @@ def udev_rule_for(iface) # Renames interfaces and refresh the udev service # - # @param [InterfaceCollection] Interfaces + # @param interfaces [InterfaceCollection] Interfaces def update_udevd(interfaces) udev_rules = interfaces.map { |i| udev_rule_for(i) }.compact Y2Network::UdevRule.write(udev_rules) diff --git a/src/lib/y2network/widgets/interface_naming.rb b/src/lib/y2network/widgets/interface_naming.rb index af08889ae..6f8d77522 100644 --- a/src/lib/y2network/widgets/interface_naming.rb +++ b/src/lib/y2network/widgets/interface_naming.rb @@ -27,7 +27,7 @@ module Widgets class InterfaceNaming < ::CWM::CustomWidget # Constructor # - # @param [Y2Network::InterfaceConfigBuilder] Interface configuration builder object + # @param builder [Y2Network::InterfaceConfigBuilder] Interface configuration builder object def initialize(builder) @builder = builder end From d2a8c5167641139b4e52db137c2c07c6ca1809d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 08:11:43 +0100 Subject: [PATCH 248/471] Drop the Interface#can_be_renamed? method --- src/lib/y2network/interface.rb | 9 ------- src/lib/y2network/virtual_interface.rb | 9 ------- test/y2network/interface_test.rb | 32 ----------------------- test/y2network/virtual_interface_test.rb | 6 ----- test/y2network/widgets/udev_rules_test.rb | 4 +-- 5 files changed, 1 insertion(+), 59 deletions(-) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 56f0b6b4d..10c881133 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -123,15 +123,6 @@ def rename(new_name, mechanism) @renaming_mechanism = mechanism end - # Determines whether the interface can be renamed - # - # An interface can be renamed if it has a MAC address or a Bus ID. - # - # @return [Boolean] - def can_be_renamed? - hardware && !(hardware.mac.nil? && hardware.busid.nil?) - end - private def system_config(name) diff --git a/src/lib/y2network/virtual_interface.rb b/src/lib/y2network/virtual_interface.rb index 9d03ef93a..f9bcecda0 100644 --- a/src/lib/y2network/virtual_interface.rb +++ b/src/lib/y2network/virtual_interface.rb @@ -31,14 +31,5 @@ class VirtualInterface < Interface def self.from_connection(name, conn) new(name, type: conn.type) end - - # Determines whether the interface can be renamed - # - # A virtual interface can always be renamed. - # - # @return [Boolean] - def can_be_renamed? - true - end end end diff --git a/test/y2network/interface_test.rb b/test/y2network/interface_test.rb index 3f0d079c7..62c3d90db 100644 --- a/test/y2network/interface_test.rb +++ b/test/y2network/interface_test.rb @@ -54,36 +54,4 @@ expect(interface.drivers).to eq([driver]) end end - - describe "#can_be_renamed?" do - let(:mac) { nil } - let(:busid) { nil } - let(:hwinfo) { instance_double(Y2Network::Hwinfo, mac: mac, busid: busid) } - - before do - allow(interface).to receive(:hardware).and_return(hwinfo) - end - - context "when no MAC or Bus ID information is available" do - it "returns false" do - expect(interface.can_be_renamed?).to eq(false) - end - end - - context "when the MAC address is present" do - let(:mac) { "01:23:45:67:89:ab" } - - it "returns true" do - expect(interface.can_be_renamed?).to eq(true) - end - end - - context "when the Bus ID is present" do - let(:busid) { "0000:08:00.0" } - - it "returns true" do - expect(interface.can_be_renamed?).to eq(true) - end - end - end end diff --git a/test/y2network/virtual_interface_test.rb b/test/y2network/virtual_interface_test.rb index a3a4710d2..afe30ed35 100644 --- a/test/y2network/virtual_interface_test.rb +++ b/test/y2network/virtual_interface_test.rb @@ -22,10 +22,4 @@ describe Y2Network::VirtualInterface do subject(:interface) { described_class.new("br0") } - - describe "#can_be_renamed?" do - it "returns true" do - expect(interface.can_be_renamed?).to eq(true) - end - end end diff --git a/test/y2network/widgets/udev_rules_test.rb b/test/y2network/widgets/udev_rules_test.rb index 2bcf01fd1..137bcccde 100644 --- a/test/y2network/widgets/udev_rules_test.rb +++ b/test/y2network/widgets/udev_rules_test.rb @@ -27,9 +27,7 @@ describe Y2Network::Widgets::UdevRules do subject { described_class.new(builder) } - let(:builder) do - instance_double(Y2Network::InterfaceConfigBuilder, interface: double(can_be_renamed?: true)) - end + let(:builder) { instance_double(Y2Network::InterfaceConfigBuilder) } before do allow(Yast::LanItems).to receive(:current_udev_name).and_return("hell666") From c9a2dce87e89a905c6965d2aae980ada4d500bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 10:31:41 +0100 Subject: [PATCH 249/471] Extend unit test coverage --- test/y2network/widgets/interface_name_test.rb | 28 +++++++++- test/y2network/widgets/udev_rules_test.rb | 54 ++++++++++++++++++- 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/test/y2network/widgets/interface_name_test.rb b/test/y2network/widgets/interface_name_test.rb index 122726385..43ac20244 100644 --- a/test/y2network/widgets/interface_name_test.rb +++ b/test/y2network/widgets/interface_name_test.rb @@ -24,7 +24,9 @@ require "y2network/interface_config_builder" describe Y2Network::Widgets::InterfaceName do - let(:builder) { Y2Network::InterfaceConfigBuilder.for("eth") } + let(:builder) do + Y2Network::InterfaceConfigBuilder.for("eth").tap { |b| b.name = "eth0" } + end subject { described_class.new(builder) } include_examples "CWM::ComboBox" @@ -58,4 +60,28 @@ expect(subject.validate).to be false end end + + describe "#store" do + before do + allow(subject).to receive(:value).and_return(value) + end + + context "when the name has changed" do + let(:value) { "eth1" } + + it "renames the interface" do + expect(builder).to receive(:rename_interface).with(value) + subject.store + end + end + + context "when the name has changed" do + let(:value) { builder.name } + + it "does not rename the interface" do + expect(builder).to_not receive(:rename_interface) + subject.store + end + end + end end diff --git a/test/y2network/widgets/udev_rules_test.rb b/test/y2network/widgets/udev_rules_test.rb index 137bcccde..f083ce833 100644 --- a/test/y2network/widgets/udev_rules_test.rb +++ b/test/y2network/widgets/udev_rules_test.rb @@ -27,12 +27,62 @@ describe Y2Network::Widgets::UdevRules do subject { described_class.new(builder) } - let(:builder) { instance_double(Y2Network::InterfaceConfigBuilder) } + let(:builder) { instance_double(Y2Network::InterfaceConfigBuilder, name: "eth0") } + let(:dialog_ret) { :ok } + let(:dialog) { instance_double(Y2Network::Dialogs::RenameInterface, run: dialog_ret) } before do allow(Yast::LanItems).to receive(:current_udev_name).and_return("hell666") - allow(Y2Network::Dialogs::RenameInterface).to receive(:new).and_return(double(run: "heaven010")) + allow(Y2Network::Dialogs::RenameInterface).to receive(:new).and_return(dialog) end include_examples "CWM::CustomWidget" + include Yast::UIShortcuts + + describe "#init" do + it "initializes the input field with the current name" do + expect(subject).to receive(:value=).with("eth0") + subject.init + end + end + + describe "#handle" do + it "opens the rename interface dialog" do + expect(dialog).to receive(:run) + subject.handle + end + + context "when the dialog returns :ok" do + it "updates the current value" do + expect(subject).to receive(:value=).with(builder.name) + subject.handle + end + end + + context "when the dialog does not returns :ok" do + let(:dialog_ret) { :cancel } + + it "does not update the current value" do + expect(subject).to_not receive(:value=) + subject.handle + end + end + end + + describe "#value=" do + it "updates the input field with the given name" do + expect(Yast::UI).to receive(:ChangeWidget).with(Id(:udev_rules_name), :Value, "eth1") + subject.value = "eth1" + end + end + + describe "#value" do + before do + expect(Yast::UI).to receive(:QueryWidget).with(Id(:udev_rules_name), :Value).and_return("eth1") + end + + it "returns the value from the input field" do + expect(subject.value).to eq("eth1") + end + end end From 4281764bcb458631df1b4fce53aaac6e3a4dccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 10:40:16 +0100 Subject: [PATCH 250/471] Drop unneeded InterfaceConfigBuilder#udev_name method --- src/lib/y2network/interface_config_builder.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 2d8d85809..e28da082d 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -306,12 +306,6 @@ def aliases=(value) @aliases = value end - # gets interface name that will be assigned by udev - def udev_name - # cannot cache as it can be changed - Yast::LanItems.current_udev_name - end - # TODO: eth only? # @return [String] def ethtool_options From 4139a44ec478a2cf3d7f47e0271660f88d54ab04 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 12:10:34 +0200 Subject: [PATCH 251/471] add interface description --- src/include/network/lan/complex.rb | 17 +++++-- .../widgets/interface_description.rb | 28 +++++++++++ src/lib/y2network/widgets/interfaces_table.rb | 47 ++++++++++++++++--- 3 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 src/lib/y2network/widgets/interface_description.rb diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index 8ce4fd18d..c5e448340 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -30,6 +30,7 @@ require "y2network/interface_config_builder" require "y2network/sequences/interface" require "y2network/widgets/interfaces_table" +require "y2network/widgets/interface_description" require "y2network/widgets/add_interface" require "y2network/widgets/edit_interface" require "y2network/widgets/delete_interface" @@ -74,10 +75,10 @@ def wd "MANAGED" => managed_widget, "IPV6" => ipv6_widget, interfaces_table.widget_id => interfaces_table.cwm_definition, + interface_description.widget_id => interface_description.cwm_definition, add_interface.widget_id => add_interface.cwm_definition, edit_interface.widget_id => edit_interface.cwm_definition, delete_interface.widget_id => delete_interface.cwm_definition - # TODO: hardware summary richtext } @wd = Convert.convert( @@ -113,8 +114,12 @@ def tabs_descr }, "overview" => { "header" => _("Overview"), - "contents" => VBox(interfaces_table.widget_id, Left(HBox(add_interface.widget_id, edit_interface.widget_id, delete_interface.widget_id))), - "widget_names" => [interfaces_table.widget_id, add_interface.widget_id, edit_interface.widget_id, delete_interface.widget_id] + "contents" => VBox( + interfaces_table.widget_id, + interface_description.widget_id, + Left(HBox(add_interface.widget_id, edit_interface.widget_id, delete_interface.widget_id)) + ), + "widget_names" => [interfaces_table.widget_id, interface_description.widget_id, add_interface.widget_id, edit_interface.widget_id, delete_interface.widget_id] } } @tabs_descr = Builtins.union(@tabs_descr, route_td) @@ -122,7 +127,11 @@ def tabs_descr end def interfaces_table - @interfaces_table ||= Y2Network::Widgets::InterfacesTable.new + @interfaces_table ||= Y2Network::Widgets::InterfacesTable.new(interface_description) + end + + def interface_description + @interface_description ||= Y2Network::Widgets::InterfaceDescription.new end def add_interface diff --git a/src/lib/y2network/widgets/interface_description.rb b/src/lib/y2network/widgets/interface_description.rb new file mode 100644 index 000000000..bb107ad4c --- /dev/null +++ b/src/lib/y2network/widgets/interface_description.rb @@ -0,0 +1,28 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm/common_widgets" + +module Y2Network + module Widgets + class InterfaceDescription < CWM::RichText + end + end +end diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 2ae07279c..4aa86853f 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -23,8 +23,10 @@ module Y2Network module Widgets class InterfacesTable < CWM::Table - def initialize + def initialize(description) textdomain "network" + + @description = description end def header @@ -36,16 +38,27 @@ def header ] end + def opt + [:notify, :immediate] + end + + def handle + @description.value = create_description + + nil + end + def items # TODO: unconfigured devices - config = Yast::Lan.yast_config.copy + config = Yast::Lan.yast_config # TODO: handle unconfigured - config.connections.map do |conn| + config.interfaces.map do |interface| + conn = config.connections.by_name(interface.name) [ - conn.name, # first is ID in table - conn.name, # TODO: better name based on hwinfo? + interface.name, # first is ID in table + interface.name, # TODO: better name based on hwinfo? interface_protocol(conn), - conn.interface, + interface.name, "" ] end @@ -54,6 +67,7 @@ def items # Workaround for usage in old CWM which also cache content of cwm items def init change_items(items) + handle end private @@ -69,6 +83,27 @@ def interface_protocol(connection) bootproto.upcase end end + + def create_description + interface = Yast::Lan.yast_config.interfaces.by_name(value) + hwinfo = interface.hardware + result = "" + if !hwinfo.exists? + result << "(" << _("No hardware information") << ")
    " + else + if !hwinfo.link + result << "(" << _("Not connected") << ")
    " + end + if !hwinfo.mac.empty? + result << "MAC : " << hwinfo.mac << "
    " + end + if !hwinfo.busid.empty? + result << "BusID : " << hwinfo.busid << "
    " + end + end + + result + end end end end From 6880b1e2f205583f4d3cf87bfd46c4e53307cc4b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 12:44:09 +0200 Subject: [PATCH 252/471] remove interface for non-physical interfaces when deleting --- src/lib/y2network/config.rb | 9 +++++++++ src/lib/y2network/widgets/delete_interface.rb | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 1ecb3a9d5..4157ba751 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -140,6 +140,15 @@ def rename_interface(old_name, new_name, mechanism) connections.by_interface(old_name).each { |c| c.interface = new_name } end + # deletes interface and all its config. If interface is physical, it is kept. + def delete_interface(name) + connections.reject! { |c| c.name == name } + interface = interfaces.by_name(name) + return if interface.hardware.exists? + + interfaces.reject! { |i| i.name == name } + end + alias_method :eql?, :== end end diff --git a/src/lib/y2network/widgets/delete_interface.rb b/src/lib/y2network/widgets/delete_interface.rb index 9b356afbc..a5747e04c 100644 --- a/src/lib/y2network/widgets/delete_interface.rb +++ b/src/lib/y2network/widgets/delete_interface.rb @@ -49,7 +49,7 @@ def handle end end - config.connections.delete_if { |c| c.name == @table.value } + config.delete_interface(@table.value) :redraw end From a92d7544541254946009734121a2e01cd3d0a94b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 13:50:03 +0200 Subject: [PATCH 253/471] fixes to test --- src/lib/y2network/interface_config_builder.rb | 9 +- test/bond_test.rb | 172 ------------------ .../interface_config_builder_test.rb | 109 ----------- test/y2network/widgets/boot_protocol_test.rb | 4 + 4 files changed, 9 insertions(+), 285 deletions(-) delete mode 100755 test/bond_test.rb diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index ac6727f7e..fabe3fb29 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -75,7 +75,7 @@ def initialize(type:, config: nil) @connection_config = config else # TODO: propose new defaults - connection_config_klass(type).new + @connection_config = connection_config_klass(type).new end end @@ -337,7 +337,7 @@ def subnet_prefix=(value) ip_config_default.address.prefix = value[1..-1].to_i elsif value.size < 3 # one or two digits can be only prefixlen ip_config_default.address.prefix = value.to_i - elsif param == "PREFIXLEN" + elsif value =~ /^\d{3}$/ ip_config_default.address.prefix = value.to_i else ip_config_default.address.netmask = value @@ -346,12 +346,13 @@ def subnet_prefix=(value) # @return [String] def hostname - @config["HOSTNAME"] + # TODO: write it + "" end # @param [String] value def hostname=(value) - @config["HOSTNAME"] = value + # TODO: write it end # sets remote ip for ptp connections diff --git a/test/bond_test.rb b/test/bond_test.rb deleted file mode 100755 index 1526b0d26..000000000 --- a/test/bond_test.rb +++ /dev/null @@ -1,172 +0,0 @@ -#! /usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -require "yast" - -Yast.import "LanItems" - -describe Yast::LanItems do - let(:netconfig_items) do - { - "eth" => { - "eth1" => { "BOOTPROTO" => "none" }, - "eth2" => { "BOOTPROTO" => "none" }, - "eth4" => { "BOOTPROTO" => "none" }, - "eth5" => { "BOOTPROTO" => "none" }, - "eth6" => { "BOOTPROTO" => "dhcp" } - }, - "bond" => { - "bond0" => { - "BOOTPROTO" => "static", - "BONDING_MASTER" => "yes", - "BONDING_SLAVE0" => "eth1", - "BONDING_SLAVE1" => "eth2" - }, - "bond1" => { - "BOOTPROTO" => "static", - "BONDING_MASTER" => "yes" - } - } - } - end - let(:hwinfo_items) do - [ - { "dev_name" => "eth11" }, - { "dev_name" => "eth12" } - ] - end - - before(:each) do - allow(Yast::NetworkInterfaces).to receive(:Read).and_return(true) - allow(Yast::NetworkInterfaces).to receive(:FilterDevices).with("netcard") { netconfig_items } - allow(Yast::NetworkInterfaces).to receive(:adapt_old_config!) - allow(Yast::NetworkInterfaces).to receive(:CleanHotplugSymlink).and_return(true) - - allow(Yast::LanItems).to receive(:ReadHardware) { hwinfo_items } - - allow(Yast::NetworkInterfaces).to receive(:devmap).and_return(nil) - - netconfig_items.each_pair do |_type, device_maps| - device_maps.each_pair do |dev, devmap| - allow(Yast::NetworkInterfaces) - .to receive(:devmap) - .with(dev) - .and_return(devmap) - end - end - - Yast::LanItems.Read - end - - describe "#GetBondableInterfaces" do - let(:expected_bondable) { ["eth4", "eth5", "eth11", "eth12"] } - # when converting to new API new API is used - # for selecting bridgable devices but imports interfaces - # from LanItems internally - let(:config) { Y2Network::Config.new(source: :test) } - let(:builder) { Y2Network::InterfaceConfigBuilder.for(Y2Network::InterfaceType::BONDING) } - - before do - allow(Y2Network::Config) - .to receive(:find) - .with(:yast) - .and_return(config) - end - - context "on common architectures" do - before(:each) do - expect(Yast::Arch).to receive(:s390).at_least(:once).and_return false - end - - it "returns list of slave candidates" do - builder.name = "bond1" - expect(builder.bondable_interfaces.map(&:name)) - .to match_array expected_bondable - end - end - - context "on s390" do - before(:each) do - expect(Yast::Arch).to receive(:s390).at_least(:once).and_return true - end - - it "returns list of slave candidates" do - expect(builder).to receive(:s390_ReadQethConfig).with("eth4") - .and_return("QETH_LAYER2" => "yes") - expect(builder).to receive(:s390_ReadQethConfig).with(::String) - .at_least(:once).and_return("QETH_LAYER2" => "no") - - builder.name = "bond1" - expect(builder.bondable_interfaces.map(&:name)) - .to match_array ["eth4"] - end - end - end - - describe "#setup_bonding" do - let(:bonding_map) { { "BONDING_SLAVE0" => "eth0", "BONDING_SLAVE1" => "enp0s3" } } - let(:mandatory_opts) { { "BONDING_MASTER" => "yes", "BONDING_MODULE_OPTS" => option } } - let(:option) { "bonding_option" } - - it "sets BONDING_MASTER and BONDING_MODULE_OPTS" do - expected_map = mandatory_opts - - ret = Yast::LanItems.setup_bonding({}, [], option) - - expect(ret.select { |k, _| k !~ /BONDING_SLAVE/ }).to match(expected_map) - end - - it "sets BONDING_SLAVEx options according to given list" do - expected_map = bonding_map - - ret = Yast::LanItems.setup_bonding({}, ["eth0", "enp0s3"], nil) - - expect(ret.select { |k, v| k =~ /BONDING_SLAVE/ && !v.nil? }).to match expected_map - end - - it "clears BONDING_SLAVEx which are not needed anymore" do - expected_map = { "BONDING_SLAVE0" => "enp0s3" } - - ret = Yast::LanItems.setup_bonding(bonding_map, ["enp0s3"], nil) - - expect(ret.select { |k, v| k =~ /BONDING_SLAVE/ && !v.nil? }).to match expected_map - # Following is required to get unneeded BONDING_SLAVEx deleted - # during write - expect(ret).to have_key("BONDING_SLAVE1") - expect(ret["BONDING_SLAVE1"]).to be nil - end - - it "clears all BONDING_SLAVESx and sets BONDING_MASTER, BONDING_OPTIONS when no slaves provided" do - ret = Yast::LanItems.setup_bonding(bonding_map, nil, option) - expected_slaves = { "BONDING_SLAVE0" => nil, "BONDING_SLAVE1" => nil } - expected_map = mandatory_opts.merge(expected_slaves) - - expect(ret).to match(expected_map) - end - - it "raises an exception in case of nil devmap" do - expect { Yast::LanItems.setup_bonding(nil, nil, nil) } - .to raise_error(ArgumentError, "Device map has to be provided.") - end - end -end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 74f389ed0..ffc926caf 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -83,25 +83,6 @@ subject.save end - it "stores aliases (old model)" do - # Avoid deleting old aliases as it can break other tests, due to singleton NetworkInterfaces - allow(Yast::NetworkInterfaces).to receive(:DeleteAlias) - subject.aliases = [{ ip: "10.0.0.0", prefixlen: "24", label: "test", mask: "" }] - subject.save - expect(Yast::LanItems.aliases).to eq( - 0 => { "IPADDR" => "10.0.0.0", "LABEL" => "test", "PREFIXLEN" => "24", "NETMASK" => "" } - ) - end - - it "stores aliases" do - subject.aliases = [{ ip: "10.0.0.0", prefixlen: "24", label: "test", mask: "" }] - subject.save - connection_config = Yast::Lan.yast_config.connections.by_name("eth0") - ip_alias = connection_config.ip_aliases.first - expect(ip_alias.address).to eq(Y2Network::IPAddress.new("10.0.0.0", 24)) - expect(ip_alias.label).to eq("test") - end - context "when interface was renamed" do before do subject.rename_interface("eth2", :mac) @@ -122,96 +103,6 @@ end end - describe "#new_device_startmode" do - DEVMAP_STARTMODE_INVALID = { - "STARTMODE" => "invalid" - }.freeze - - AVAILABLE_PRODUCT_STARTMODES = [ - "hotplug", - "manual", - "off", - "nfsroot" - ].freeze - - ["hotplug", ""].each do |hwinfo_hotplug| - expected_startmode = hwinfo_hotplug == "hotplug" ? "hotplug" : "auto" - hotplug_desc = hwinfo_hotplug == "hotplug" ? "can hotplug" : "cannot hotplug" - - context "When product_startmode is auto and device " + hotplug_desc do - it "results to auto" do - expect(Yast::ProductFeatures) - .to receive(:GetStringFeature) - .with("network", "startmode") { "auto" } - - result = config_builder.device_sysconfig["STARTMODE"] - expect(result).to be_eql "auto" - end - end - - context "When product_startmode is ifplugd and device " + hotplug_desc do - before(:each) do - expect(Yast::ProductFeatures) - .to receive(:GetStringFeature) - .with("network", "startmode") { "ifplugd" } - allow(config_builder).to receive(:hotplug_interface?) { hwinfo_hotplug == "hotplug" } - # setup stubs by default at results which doesn't need special handling - allow(Yast::Arch).to receive(:is_laptop) { true } - allow(Yast::NetworkService).to receive(:is_network_manager) { false } - end - - it "results to #{expected_startmode} when not running on laptop" do - expect(Yast::Arch) - .to receive(:is_laptop) { false } - - result = config_builder.device_sysconfig["STARTMODE"] - expect(result).to be_eql expected_startmode - end - - it "results to ifplugd when running on laptop" do - expect(Yast::Arch) - .to receive(:is_laptop) { true } - - result = config_builder.device_sysconfig["STARTMODE"] - expect(result).to be_eql "ifplugd" - end - - it "results to #{expected_startmode} when running NetworkManager" do - expect(Yast::NetworkService) - .to receive(:is_network_manager) { true } - - result = config_builder.device_sysconfig["STARTMODE"] - expect(result).to be_eql expected_startmode - end - - it "results to #{expected_startmode} when current device is virtual one" do - # check for virtual device type is done via Builtins.contains. I don't - # want to stub it because it requires default stub value definition for - # other calls of the function. It might have unexpected inpacts. - allow(config_builder).to receive(:type).and_return(Y2Network::InterfaceType::BONDING) - - result = config_builder.device_sysconfig["STARTMODE"] - expect(result).to be_eql expected_startmode - end - end - - context "When product_startmode is not auto neither ifplugd" do - AVAILABLE_PRODUCT_STARTMODES.each do |product_startmode| - it "for #{product_startmode} it results to #{expected_startmode} if device " + hotplug_desc do - expect(Yast::ProductFeatures) - .to receive(:GetStringFeature) - .with("network", "startmode") { product_startmode } - expect(config_builder) - .to receive(:hotplug_interface?) { hwinfo_hotplug == "hotplug" } - - result = config_builder.device_sysconfig["STARTMODE"] - expect(result).to be_eql expected_startmode - end - end - end - end - end - describe "#rename_interface" do it "updates the interface name" do expect { config_builder.rename_interface("eth2", :mac) } diff --git a/test/y2network/widgets/boot_protocol_test.rb b/test/y2network/widgets/boot_protocol_test.rb index 0be3b7140..3c45ee93e 100644 --- a/test/y2network/widgets/boot_protocol_test.rb +++ b/test/y2network/widgets/boot_protocol_test.rb @@ -22,6 +22,7 @@ require "y2network/widgets/boot_protocol" require "y2network/interface_config_builder" +require "y2network/connection_config/ethernet" describe Y2Network::Widgets::BootProtocol do let(:builder) { Y2Network::InterfaceConfigBuilder.for("eth") } @@ -78,6 +79,7 @@ def expect_set_widget(id, value, value_type: :Value) end it "sets hostname" do + pending "write it" expect_set_widget(:bootproto_hostname, "pepa") subject.init @@ -207,6 +209,7 @@ def expect_set_widget(id, value, value_type: :Value) end it "sets hostname to value of hostname widget" do + pending "write hostname" allow(Yast::UI).to receive(:QueryWidget).with(:bootproto_hostname, :Value).and_return("test.suse.cz") subject.store @@ -231,6 +234,7 @@ def expect_set_widget(id, value, value_type: :Value) end it "sets netmask for ipv4 netmask value" do + pending "drop netmask" allow(Yast::UI).to receive(:QueryWidget).with(:bootproto_netmask, :Value).and_return("255.255.0.0") subject.store From 2168fd7554cd7231ce7583f13e8f0bcabaf78904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 11:52:10 +0100 Subject: [PATCH 254/471] Extend Udev class to easily get the device --- src/lib/y2network/udev_rule.rb | 44 ++++++++++++-------- test/y2network/interfaces_collection_test.rb | 15 +++++++ test/y2network/udev_rule_test.rb | 10 ++++- 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 79380d290..94305566e 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -37,14 +37,24 @@ module Y2Network # rule.to_s #=> "ACTION==\"add\", SUBSYSTEM==\"net\", ATTR{address}==\"?*31:78:f2\", NAME=\"eth0\"" class UdevRule class << self + # Returns all persistent network rules + # + # @return [Array] Persistent network rules + def all + return @all if @all + rules_map = Yast::SCR.Read(Yast::Path.new(".udev_persistent.net")) || {} + @all = rules_map.values.map do |parts| + udev_parts = parts.map { |p| UdevRulePart.from_string(p) } + new(udev_parts) + end + end + # Returns the udev rule for a given device # # @param device [String] Network device name # @return [UdevRule] udev rule def find_for(device) - return nil unless rules_map.key?(device) - parts = rules_map[device].map { |p| UdevRulePart.from_string(p) } - new(parts) + all.find { |r| r.device == device } end # Helper method to create a rename rule based on a MAC address @@ -107,16 +117,7 @@ def write(udev_rules) # Clears rules cache map def reset_cache - @rules_map = nil - end - - private - - # Returns the rules map - # - # @return [Hash>] Rules parts (as strings) indexed by interface name - def rules_map - @rules_map ||= Yast::SCR.Read(Yast::Path.new(".udev_persistent.net")) || {} + @all = nil end end @@ -148,17 +149,19 @@ def to_s # Returns the part with the given key # - # @param key [String] Key name - def part_by_key(key) - parts.find { |p| p.key == key } + # @param key [String] Key name to match + # @param operator [String,nil] Operator to match; nil omits matching the operator + def part_by_key(key, operator = nil) + parts.find { |p| p.key == key && (operator.nil? || p.operator == operator) } end # Returns the value for a given part # # @param key [String] Key name + # @param operator [String,nil] Operator to match; nil omits matching the operator # @return [String,nil] Value or nil if not found a part which such a key - def part_value_for(key) - part = part_by_key(key) + def part_value_for(key, operator = nil) + part = part_by_key(key, operator) return nil unless part part.value end @@ -186,5 +189,10 @@ def bus_id def dev_port part_value_for("ATTR{dev_port}") end + + # Returns the device mentioned in the rule (if any) + def device + part_value_for("NAME", "=") + end end end diff --git a/test/y2network/interfaces_collection_test.rb b/test/y2network/interfaces_collection_test.rb index 2bc65ea7c..7a9c0cddc 100644 --- a/test/y2network/interfaces_collection_test.rb +++ b/test/y2network/interfaces_collection_test.rb @@ -91,4 +91,19 @@ end end end + + describe "#known_names" do + it "returns the list of known interfaces" do + expect(collection.known_names).to eq(["eth0", "br0", "wlan0"]) + end + + context "when an interface was renamed" do + before do + eth0.rename("eth1", :mac) + end + it "returns the old and the new names" do + expect(collection.known_names).to eq(["eth0", "eth1", "br0", "wlan0"]) + end + end + end end diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index 46404fb39..637065197 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -140,7 +140,7 @@ end end - describe "#bus_id" do + describe "#dev_port" do subject(:udev_rule) { described_class.new_bus_id_based_rename("eth0", "0000:08:00.0", "1") } it "returns the device port from the udev rule" do @@ -155,4 +155,12 @@ end end end + + describe "#device" do + subject(:udev_rule) { described_class.new_mac_based_rename("eth0", "01:23:45:67:89:ab") } + + it "returns device" do + expect(udev_rule.device).to eq("eth0") + end + end end From a561c723be18c1c643c2370d6b89c6c1b2bb3839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 13:26:51 +0100 Subject: [PATCH 255/471] Do not overwrite udev rules for unknown devices --- src/lib/y2network/interfaces_collection.rb | 10 ++++++++++ src/lib/y2network/sysconfig/interfaces_writer.rb | 13 +++++++++++-- .../y2network/sysconfig/interfaces_writer_test.rb | 15 +++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index e9581cedc..b15b38af6 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -84,6 +84,16 @@ def delete_if(&block) self end + # Returns all interfaces names + # + # For those interfaces that are renamed, the new and old names are included + # in the list. + # + # @return [Array] List of known interfaces + def known_names + @interfaces.map { |i| [i.old_name, i.name] }.flatten.compact + end + # Compares InterfacesCollections # # @return [Boolean] true when both collections contain only equal interfaces, diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 8f6de043e..affb93868 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -57,13 +57,22 @@ def udev_rule_for(iface) end end - # Renames interfaces and refresh the udev service + # Renames interfaces and refreshes the udev service # # @param interfaces [InterfaceCollection] Interfaces def update_udevd(interfaces) + update_udev_rules(interfaces) + reload_udev_rules + end + + def update_udev_rules(interfaces) udev_rules = interfaces.map { |i| udev_rule_for(i) }.compact - Y2Network::UdevRule.write(udev_rules) + known_names = interfaces.known_names + custom_rules = Y2Network::UdevRule.all.reject { |u| known_names.include?(u.device) } + Y2Network::UdevRule.write(custom_rules + udev_rules) + end + def reload_udev_rules Yast::Execute.on_target("/usr/bin/udevadm", "control", "--reload") Yast::Execute.on_target("/usr/bin/udevadm", "trigger", "--subsystem-match=net", "--action=add") # wait so that ifcfgs written in NetworkInterfaces are newer diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index ff271fb95..2627ee85f 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -111,6 +111,21 @@ subject.write(interfaces) end end + + context "when there is some rule for an unknown interface" do + let(:unknown_rule) { Y2Network::UdevRule.new_mac_based_rename("unknown", "00:11:22:33:44:55:66") } + + before do + allow(Y2Network::UdevRule).to receive(:all).and_return([unknown_rule]) + end + + it "keeps the rule" do + expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(rules.first.to_s).to eq(unknown_rule.to_s) + end + subject.write(interfaces) + end + end end context "when the interface is not renamed" do From f46423e4d712fc127f8afcf0390efce1514ab0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 29 Aug 2019 13:27:07 +0100 Subject: [PATCH 256/471] Speed up InterfacesWriter test --- test/y2network/sysconfig/interfaces_writer_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index 2627ee85f..a0970b5fe 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -41,6 +41,7 @@ before do allow(Yast::Execute).to receive(:on_target) allow(eth0).to receive(:hardware).and_return(hardware) + allow(writer).to receive(:sleep) end around do |example| From d9bb2f0412207e23d9103244435659916f642172 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 16:22:15 +0200 Subject: [PATCH 257/471] fix tests --- src/include/network/lan/cmdline.rb | 11 +- src/include/network/lan/complex.rb | 12 +- src/lib/y2network/dialogs/add_interface.rb | 14 +- src/lib/y2network/interface_config_builder.rb | 8 +- .../interface_config_builders/infiniband.rb | 1 + src/lib/y2network/widgets/interfaces_table.rb | 4 +- test/bridge_test.rb | 6 + test/cmdline_test.rb | 2 + test/default_route_test.rb | 146 ------------------ test/network_autoconfiguration_test.rb | 1 + test/network_autoyast_test.rb | 1 + test/test_helper.rb | 1 + test/y2network/dialogs/add_interface_test.rb | 12 -- test/y2network/hwinfo_test.rb | 1 + .../infiniband_test.rb | 26 ---- 15 files changed, 29 insertions(+), 217 deletions(-) delete mode 100755 test/default_route_test.rb diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index c4844bd67..c65fe1ef5 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -184,17 +184,14 @@ def ListHandler(options) # Handler for action "add" # @param [Hash{String => String}] options action options def AddHandler(options) - LanItems.AddNew - Lan.Add - LanItems.Items[LanItems.current]["ifcfg"] = options.fetch("name", "") - LanItems.type = options.fetch("type", infered_type(options)) - if LanItems.type.empty? + type = options.fetch("type", infered_type(options)) + if type.empty? Report.Error(_("The device type is mandatory.")) return false end - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.type) - builder.name = LanItems.GetCurrentName() + builder = Y2Network::InterfaceConfigBuilder.for(Y2Network::InterfaceType.from_short_name(type)) + builder.name = options.fetch("name") update_builder_from_options!(builder, options) return false unless validate_config(builder) diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index c5e448340..e979b4ed1 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -72,13 +72,13 @@ def initialize_network_lan_complex(include_target) def wd return @wd if @wd @wd = { - "MANAGED" => managed_widget, - "IPV6" => ipv6_widget, - interfaces_table.widget_id => interfaces_table.cwm_definition, + "MANAGED" => managed_widget, + "IPV6" => ipv6_widget, + interfaces_table.widget_id => interfaces_table.cwm_definition, interface_description.widget_id => interface_description.cwm_definition, - add_interface.widget_id => add_interface.cwm_definition, - edit_interface.widget_id => edit_interface.cwm_definition, - delete_interface.widget_id => delete_interface.cwm_definition + add_interface.widget_id => add_interface.cwm_definition, + edit_interface.widget_id => edit_interface.cwm_definition, + delete_interface.widget_id => delete_interface.cwm_definition } @wd = Convert.convert( diff --git a/src/lib/y2network/dialogs/add_interface.rb b/src/lib/y2network/dialogs/add_interface.rb index 83050b2d9..7b8e9992a 100644 --- a/src/lib/y2network/dialogs/add_interface.rb +++ b/src/lib/y2network/dialogs/add_interface.rb @@ -41,11 +41,6 @@ def contents # initialize legacy stuff, that should be removed soon def legacy_init - # FIXME: can be mostly deleted - Yast::LanItems.AddNew - # FIXME: can be partly deleted and partly moved - Yast::Lan.Add - # FIXME: This is for backward compatibility only # dhclient needs to set just one dhcp enabled interface to # DHCLIENT_SET_DEFAULT_ROUTE=yes. Otherwise interface is selected more @@ -65,19 +60,12 @@ def run log.info "AddInterface result #{ret}" ret = :back if ret == :abort - # TODO: replace with builder initialization - if ret == :back - Yast::LanItems.Rollback - return nil - end + return if ret == :back # TODO: use factory to get proper builder builder = InterfaceConfigBuilder.for(InterfaceType.from_short_name(@type_widget.result)) proposed_name = Yast::LanItems.new_type_devices(@type_widget.result, 1).first builder.name = proposed_name - Yast::NetworkInterfaces.Name = proposed_name - Yast::LanItems.Items[Yast::LanItems.current]["ifcfg"] = proposed_name - Yast::LanItems.Items[Yast::LanItems.current]["udev"] = {} builder end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 32209983a..b7e7bb067 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -73,11 +73,11 @@ def initialize(type:, config: nil) # TODO: also config need to store it, as newly added can be later # edited with option for not yet created interface @newly_added = config.nil? - if config - @connection_config = config + @connection_config = if config + config else # TODO: propose new defaults - @connection_config = connection_config_klass(type).new + connection_config_klass(type).new end end @@ -390,7 +390,7 @@ def ip_config_default # # @param type [Y2Network::InterfaceType] type of device def connection_config_klass(type) - ConnectionConfig.const_get(type.name) + ConnectionConfig.const_get(type.class_name) rescue NameError log.error "Could not find a class to handle '#{type.name}' connections" ConnectionConfig::Base diff --git a/src/lib/y2network/interface_config_builders/infiniband.rb b/src/lib/y2network/interface_config_builders/infiniband.rb index 46878a931..e6019ae35 100644 --- a/src/lib/y2network/interface_config_builders/infiniband.rb +++ b/src/lib/y2network/interface_config_builders/infiniband.rb @@ -30,6 +30,7 @@ def initialize(config: nil) # @param value [String] ipoib mode configuration def ipoib_mode=(value) + value = "" if value == "default" connection_config.ipoib_mode = IpoibMode.from_name(value) end diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 4aa86853f..b9b6ce95e 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -91,9 +91,7 @@ def create_description if !hwinfo.exists? result << "(" << _("No hardware information") << ")
    " else - if !hwinfo.link - result << "(" << _("Not connected") << ")
    " - end + result << "(" << _("Not connected") << ")
    " if !hwinfo.link if !hwinfo.mac.empty? result << "MAC : " << hwinfo.mac << "
    " end diff --git a/test/bridge_test.rb b/test/bridge_test.rb index 38f304c6d..f8a8c9e1f 100755 --- a/test/bridge_test.rb +++ b/test/bridge_test.rb @@ -25,6 +25,7 @@ require "y2network/config" require "y2network/interface" +require "y2network/type_detector" Yast.import "LanItems" @@ -114,6 +115,10 @@ end end + allow(Y2Network::TypeDetector) + .to receive(:type_of) + .with(/eth[0-9]/) + .and_return(Y2Network::InterfaceType::ETHERNET) Yast::LanItems.Read end @@ -125,6 +130,7 @@ let(:builder) { Y2Network::InterfaceConfigBuilder.for(Y2Network::InterfaceType::BRIDGE) } it "returns list of slave candidates" do + pending "old API is dropped, so adapt it" allow(Y2Network::Config) .to receive(:find) .with(:yast) diff --git a/test/cmdline_test.rb b/test/cmdline_test.rb index 3a24367b6..abafcba7a 100644 --- a/test/cmdline_test.rb +++ b/test/cmdline_test.rb @@ -71,11 +71,13 @@ def initialize context "when startmode is given" do context "but with an invalid option" do it "reports an error" do + pending "invalid option is not yet handled" expect(Yast::Report).to receive(:Error) subject.AddHandler(options.merge("startmode" => "wrong")) end it "returns false" do + pending "invalid option is not yet handled" expect(subject.AddHandler(options.merge("startmode" => "wrong"))).to eq false end end diff --git a/test/default_route_test.rb b/test/default_route_test.rb deleted file mode 100755 index 09d16b662..000000000 --- a/test/default_route_test.rb +++ /dev/null @@ -1,146 +0,0 @@ -#!/usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -require "network/install_inf_convertor" -require "y2network/interface_config_builder" -require "y2network/interfaces_collection" -require "y2network/physical_interface" - -Yast.import "Lan" - -describe "Yast::LanItemsClass" do - subject { Yast::LanItems } - - let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :sysconfig) } - let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } - let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } - - before do - allow(Yast::Lan).to receive(:yast_config).and_return(config) - end - - before do - Yast.import "LanItems" - - @ifcfg_files = SectionKeyValue.new - - # network configs - allow(Yast::SCR).to receive(:Dir) do |path| - case path.to_s - when ".network.section" - @ifcfg_files.sections - when /^\.network\.value\."(eth\d+)"$/ - @ifcfg_files.keys(Regexp.last_match(1)) - when ".modules.options", ".etc.install_inf" - [] - else - raise "Unexpected Dir #{path}" - end - end - - allow(Yast::SCR).to receive(:Read) do |path| - if path.to_s =~ /^\.network\.value\."(eth\d+)".(.*)/ - next @ifcfg_files.get(Regexp.last_match(1), Regexp.last_match(2)) - end - - raise "Unexpected Read #{path}" - end - - allow(Yast::SCR).to receive(:Write) do |path, value| - if path.to_s =~ /^\.network\.value\."(eth\d+)".(.*)/ - @ifcfg_files.set(Regexp.last_match(1), Regexp.last_match(2), value) - elsif path.to_s == ".network" && value.nil? - true - else - raise "Unexpected Write #{path}, #{value}" - end - end - - # stub NetworkInterfaces, apart from the ifcfgs - allow(Yast::NetworkInterfaces) - .to receive(:CleanHotplugSymlink) - allow(Yast::NetworkInterfaces) - .to receive(:adapt_old_config!) - allow(Yast::NetworkInterfaces) - .to receive(:GetTypeFromSysfs) - .with(/eth\d+/) - .and_return "eth" - allow(Yast::NetworkInterfaces) - .to receive(:GetType) - .with(/eth\d+/) - .and_return "eth" - allow(Yast::NetworkInterfaces) - .to receive(:GetType) - .with("") - .and_return nil - Yast::NetworkInterfaces.instance_variable_set(:@initialized, false) - - allow(Yast::InstallInfConvertor.instance) - .to receive(:AllowUdevModify).and_return false - - # These "expect" should be "allow", but then it does not work out, - # because SCR multiplexes too much and the matchers get confused. - - # Hardware detection - expect(Yast::SCR) - .to receive(:Read) - .with(path(".probe.netcard")) - .and_return([]) - - # miscellaneous uninteresting but hard to avoid stuff - - allow(Yast::Arch).to receive(:architecture).and_return "x86_64" - allow(Yast::Confirm).to receive(:Detection).and_return true - - expect(Yast::SCR) - .to receive(:Read) - .with(path(".etc.install_inf.BrokenModules")) - .and_return "" - expect(Yast::SCR) - .to receive(:Read) - .with(path(".udev_persistent.net")) - .and_return({}) - expect(Yast::SCR) - .to receive(:Read) - .with(path(".udev_persistent.drivers")) - .and_return({}) - end - - it "does not modify DHCLIENT_SET_DEFAULT_ROUTE if not explicitly set, when editing an ifcfg" do - @ifcfg_files.set("eth0", "STARTMODE", "auto") - @ifcfg_files.set("eth0", "BOOTPROTO", "dhcp4") - - subject.Read - subject.current = 0 - - builder = Y2Network::InterfaceConfigBuilder.for("eth") - builder.name = subject.GetCurrentName() - subject.SetItem(builder: builder) - - subject.Commit(builder) - subject.write - - ifcfg = Yast::NetworkInterfaces.FilterDevices("")["eth"]["eth0"] - expect(ifcfg["DHCLIENT_SET_DEFAULT_ROUTE"]).to be_nil - end -end diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 85376d78a..149af0373 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -181,6 +181,7 @@ def probe_netcard_factory(num) end it "configures just one NIC to have a default route" do + pending "adapt to new API" expect { instance.configure_dhcp }.to_not raise_error result = Yast::NetworkInterfaces.FilterDevices("") expect(result["eth"]["eth0"]["DHCLIENT_SET_DEFAULT_ROUTE"]).to eq "yes" diff --git a/test/network_autoyast_test.rb b/test/network_autoyast_test.rb index dd7585cff..c71d42988 100755 --- a/test/network_autoyast_test.rb +++ b/test/network_autoyast_test.rb @@ -535,6 +535,7 @@ def mock_lan_item(renamed_to: nil) # applying of the ruleset we could end with new nameset e.g. # which obviously leads to misconfiguration of the system it "applies rules so, that names remain unique" do + pending "adapt to new API" network_autoyast.send(:assign_udevs_to_devs, udev_rules) lan_items = Yast::LanItems diff --git a/test/test_helper.rb b/test/test_helper.rb index 5fbf05853..03ab2704e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -63,6 +63,7 @@ c.before do Yast::Lan.clear_configs allow(Yast::NetworkInterfaces).to receive(:Write) + allow(Y2Network::Hwinfo).to receive(:hwinfo_from_hardware) end end diff --git a/test/y2network/dialogs/add_interface_test.rb b/test/y2network/dialogs/add_interface_test.rb index 1fcef3071..43ba25bbe 100644 --- a/test/y2network/dialogs/add_interface_test.rb +++ b/test/y2network/dialogs/add_interface_test.rb @@ -32,18 +32,6 @@ allow(subject).to receive(:cwm_show).and_return(:abort) end - it "adds new interface to lan items" do - expect(Yast::LanItems).to receive(:AddNew) - - subject.run - end - - it "adds new interface to lan" do - expect(Yast::Lan).to receive(:Add) - - subject.run - end - it "returns nil if canceled" do allow(subject).to receive(:cwm_show).and_return(:abort) diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index efca20b14..cc1fcf930 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -31,6 +31,7 @@ let(:hw_wrapper) { double("Y2Network::HardwareWrapper", ReadHardware: hardware) } before do + allow(Y2Network::Hwinfo).to receive(:hwinfo_from_hardware).and_call_original allow(Y2Network::HardwareWrapper).to receive(:new).and_return(hw_wrapper) allow(Y2Network::UdevRule).to receive(:find_for).with(interface_name).and_return(udev_rule) end diff --git a/test/y2network/interface_config_builders/infiniband_test.rb b/test/y2network/interface_config_builders/infiniband_test.rb index bc0abd401..254314360 100644 --- a/test/y2network/interface_config_builders/infiniband_test.rb +++ b/test/y2network/interface_config_builders/infiniband_test.rb @@ -47,32 +47,6 @@ end end - describe "#save" do - around do |test| - Yast::LanItems.AddNew - test.call - Yast::LanItems.Rollback - end - - it "stores ipoib configuration" do - subject.ipoib_mode = "datagram" - - subject.save - devmap = subject.device_sysconfig - - expect(devmap).to include("IPOIB_MODE" => "datagram") - end - - it "stores nil to ipoib configuration if mode is 'default'" do - subject.ipoib_mode = "default" - - subject.save - devmap = subject.device_sysconfig - - expect(devmap).to include("IPOIB_MODE" => nil) - end - end - describe "#ipoib_mode" do context "modified by ipoib=" do it "returns modified value" do From de3bebe20e9a3005ff48582a9d85c244ba297016 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 17:22:05 +0200 Subject: [PATCH 258/471] changes from review --- src/include/network/lan/cmdline.rb | 4 ++-- src/lib/y2network/config.rb | 3 ++- src/lib/y2network/interface_config_builders/bonding.rb | 1 + src/lib/y2network/interface_config_builders/infiniband.rb | 8 +++----- src/lib/y2network/interface_config_builders/tap.rb | 2 ++ src/lib/y2network/interface_config_builders/tun.rb | 2 ++ 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/include/network/lan/cmdline.rb b/src/include/network/lan/cmdline.rb index c65fe1ef5..73e938758 100644 --- a/src/include/network/lan/cmdline.rb +++ b/src/include/network/lan/cmdline.rb @@ -302,9 +302,9 @@ def update_builder_from_options!(builder, options) when "bond" builder.slaves = options.fetch("slaves", "").split(" ") when "vlan" - builder.etherdevice = options.fetch("ethdevice", "") + builder.etherdevice = options["ethdevice"] when "br" - builder.ports = options.fetch("bridge_ports", "") + builder.ports = options["bridge_ports"] end default_bootproto = options.keys.include?("ip") ? "static" : "none" diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 4157ba751..500eaeb1d 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -140,7 +140,8 @@ def rename_interface(old_name, new_name, mechanism) connections.by_interface(old_name).each { |c| c.interface = new_name } end - # deletes interface and all its config. If interface is physical, it is kept. + # deletes interface and all its config. If interface is physical, + # it is not removed as we cannot remove physical interface. def delete_interface(name) connections.reject! { |c| c.name == name } interface = interfaces.by_name(name) diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 26826b4c4..22b3badbd 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -45,6 +45,7 @@ def bond_options=(value) end # current options for bonding + # @return [String] def bond_options connection_config.options end diff --git a/src/lib/y2network/interface_config_builders/infiniband.rb b/src/lib/y2network/interface_config_builders/infiniband.rb index e6019ae35..4a3db02fa 100644 --- a/src/lib/y2network/interface_config_builders/infiniband.rb +++ b/src/lib/y2network/interface_config_builders/infiniband.rb @@ -38,11 +38,9 @@ def ipoib_mode=(value) # # @return [String] particular mode or "default" when not set def ipoib_mode - case connection_config.ipoib_mode.name - when "" then "default" - else - connection_config.ipoib_mode.name - end + return "default" if connection_config.ipoib_mode.name == "" + + connection_config.ipoib_mode.name end end end diff --git a/src/lib/y2network/interface_config_builders/tap.rb b/src/lib/y2network/interface_config_builders/tap.rb index 322376f7d..85b15134a 100644 --- a/src/lib/y2network/interface_config_builders/tap.rb +++ b/src/lib/y2network/interface_config_builders/tap.rb @@ -32,6 +32,8 @@ def tunnel_user_group [connection_config.owner, connection_config.group] end + # @param [String] user owner of tunnel. Name or UID + # @param [String] group owner of tunnel. Name or GID def assign_tunnel_user_group(user, group) connection_config.owner = user connection_config.group = group diff --git a/src/lib/y2network/interface_config_builders/tun.rb b/src/lib/y2network/interface_config_builders/tun.rb index f0e5c1a81..70d45e57c 100644 --- a/src/lib/y2network/interface_config_builders/tun.rb +++ b/src/lib/y2network/interface_config_builders/tun.rb @@ -32,6 +32,8 @@ def tunnel_user_group [connection_config.owner, connection_config.group] end + # @param [String] user owner of tunnel. Name or UID + # @param [String] group owner of tunnel. Name or GID def assign_tunnel_user_group(user, group) connection_config.owner = user connection_config.group = group From 2e88984d0852fe480ddbb607d3bc3b8776bc8fe7 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 17:24:41 +0200 Subject: [PATCH 259/471] remove even more overview related functionality --- src/include/network/lan/complex.rb | 313 ----------------------------- 1 file changed, 313 deletions(-) diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index e979b4ed1..56cd57b43 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -201,84 +201,6 @@ def WriteDialog ret ? :next : :abort end - def AddInterface - Lan.Add - LanItems.operation = :add - LanItems.SelectHWMap(Ops.get_map(LanItems.getCurrentItem, "hwinfo", {})) - Ops.set( - LanItems.Items, - [LanItems.current, "ifcfg"], - Ops.get_string(LanItems.getCurrentItem, ["hwinfo", "dev_name"], "") - ) - LanItems.operation = :edit - fw = "" - if LanItems.needFirmwareCurrentItem - fw = LanItems.GetFirmwareForCurrentItem - if fw != "" - if !Package.Installed(fw) && !Package.Available(fw) - Popup.Message( - Builtins.sformat( - _( - "Firmware is needed. Install it from \n" \ - "the add-on CD.\n" \ - "First add the add-on CD to your YaST software repositories then return \n" \ - "to this configuration dialog.\n" - ) - ) - ) - return false - elsif !Builtins.contains(LanItems.Requires, fw) - LanItems.Requires = Builtins.add(LanItems.Requires, fw) - end - else - return Popup.ContinueCancel( - _( - "The device needs a firmware to function properly. Usually, it can be\n" \ - "downloaded from your driver vendor's Web page. \n" \ - "If you have already downloaded and installed the firmware, click\n" \ - "Continue to configure the device. Otherwise click Cancel and\n" \ - "return to this dialog once you have installed the firmware.\n" - ) - ) - end - end - - # this is one of 2 places to install packages :-( - # - kernel modules (InstallKernel): before loaded - # - wlan firmware: here, just because it is copied from modems - # #45960 - if LanItems.Requires != [] && !LanItems.Requires.nil? - return false if PackagesInstall(LanItems.Requires) != :next - if fw == "b43-fwcutter" - if Popup.ContinueCancelHeadline( - _("Installing firmware"), - _( - "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?" - ) - ) - command = Convert.convert( - SCR.Execute( - path(".target.bash_output"), - "/usr/sbin/install_bcm43xx_firmware" - ), - from: "any", - to: "map " - ) - if Ops.get_integer(command, "exit", -1) != 0 - Popup.ErrorDetails( - _("An error occurred during firmware installation."), - Ops.get_string(command, "stderr", "") - ) - else - Popup.Message("bcm43xx_firmware installed successfully") - end - end - end - end - # TODO: Refresh hwinfo in LanItems - true - end - # Returns true if the device can be used (means handled as normal linux device) # or false otherwise (it is used mainly at s390 based systems where a special # handling is needed to run linux device emulation) @@ -286,229 +208,6 @@ def DeviceReady(devname) !Arch.s390 || s390_DriverLoaded(devname) end - def enableDisableButtons - LanItems.current = Convert.to_integer( - UI.QueryWidget(Id(:_hw_items), :CurrentItem) - ) - - UI.ChangeWidget(:_hw_sum, :Value, LanItems.GetItemDescription) - if !LanItems.IsCurrentConfigured # unconfigured - UI.ChangeWidget(Id(:delete), :Enabled, false) - else - UI.ChangeWidget(Id(:delete), :Enabled, true) - end - - UI.ChangeWidget(Id(:edit), :Enabled, LanItems.enableCurrentEditButton) - - if !Mode.config && Lan.HaveXenBridge # #196479 - # #178848 - overview_buttons.keys.each { |b| UI.ChangeWidget(Id(b), :Enabled, false) } - end - - nil - end - - # Automatically configures slaves when user enslaves them into a bond or bridge device - def UpdateSlaves - # TODO: sometimes it is called when no device is selected and then it crashes - return if LanItems.GetCurrentName.nil? || LanItems.GetCurrentName.empty? - - current = LanItems.current - config = Lan.yast_config.copy - connection_config = config.connections.by_name(LanItems.GetCurrentName) - Yast.y2milestone("update slaves for #{current}:#{LanItems.GetCurrentName}:#{LanItems.GetCurrentType}") - master_builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) - master_builder.name = LanItems.GetCurrentName() - - Lan.autoconf_slaves.each do |dev| - if LanItems.FindAndSelect(dev) - connection_config = config.connections.by_name(LanItems.GetCurrentName) - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) - builder.name = LanItems.GetCurrentName() - LanItems.SetItem(builder: builder) - else - dev_index = LanItems.FindDeviceIndex(dev) - if dev_index < 0 - log.error("initOverview: invalid slave device name #{dev}") - next - end - LanItems.current = dev_index - - AddInterface() - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetDeviceType(current)) - builder.name = LanItems.GetCurrentName - end - # clear defaults, some defaults are invalid for slaves and can cause troubles - # in related sysconfig scripts or makes no sence for slaves (e.g. ip configuration). - builder.subnet_prefix = "" - builder.boot_protocol = "none" - case master_builder.type.short_name - when "bond" - LanItems.startmode = "hotplug" - # If there is already a rule based on the bus_id, do not update it. - if LanItems.current_udev_rule.empty? || LanItems.GetItemUdev("KERNELS").empty? - LanItems.update_item_udev_rule!(:bus_id) - end - when "br" - builder.ip_address = "" - else - raise "Adapting slaves for wrong type #{master_builder.type.inspect}" - end - - LanItems.Commit(builder) - end - - # Once the interfaces have been configured we should empty the list to - # avoid configure them again in case that some interface is removed from the - # master. - Lan.autoconf_slaves = [] - - LanItems.current = current - - nil - end - - # Automatically updates interfaces configuration according users input. - # - # Perform automatic configuration based on user input. E.g. when an interface is inserted - # into bond device and persistence based on bus id is required, then some configuration changes - # are required in ifcfg and udev. It used to be needed to do it by hand before. - def AutoUpdateOverview - # TODO: allow disabling. E.g. if bus id based persistency is not requested. - UpdateSlaves() - - nil - end - - def initOverview(_key) - # search for automatic updates - AutoUpdateOverview() - - # update table with device description - term_items = - LanItems.Overview.map do |i| - t = Item(Id(i["id"])) - (i["table_descr"] || []).each { |l| t << l } - t - end - - UI.ChangeWidget(Id(:_hw_items), :Items, term_items) - - if !@shown - disable_unconfigureable_items([:_hw_items, :_hw_sum] + overview_buttons.keys, true) - @shown = true - else - enableDisableButtons - end - - log.info("LanItems #{LanItems.Items}") - - nil - end - - def handleOverview(_key, event) - if !disable_unconfigureable_items([:_hw_items, :_hw_sum] + overview_buttons.keys, false) - enableDisableButtons - end - UI.ChangeWidget(:_hw_sum, :Value, LanItems.GetItemDescription) - - if Ops.get_string(event, "EventReason", "") == "Activated" - case Ops.get_symbol(event, "ID") - when :add - Y2Network::Sequences::Interface.new.add - return :redraw - when :edit - if LanItems.IsCurrentConfigured - config = Lan.yast_config.copy - connection_config = config.connections.by_name(LanItems.GetCurrentName) - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType(), config: connection_config) - builder.name = LanItems.GetCurrentName() - LanItems.SetItem(builder: builder) - - if LanItems.startmode == "managed" - # Continue-Cancel popup - if !Popup.ContinueCancel( - _( - "The interface is currently set to be managed\n" \ - "by the NetworkManager applet.\n" \ - "\n" \ - "If you edit the settings for this interface here,\n" \ - "the interface will no longer be managed by NetworkManager.\n" - ) - ) - # y2r: cannot break from middle of switch - # but in this function return will do - return nil # means cancel - end - - LanItems.startmode = "ifplugd" - end - else - if !AddInterface() - Builtins.y2error("handleOverview: AddInterface failed.") - # y2r: cannot break from middle of switch - # but in this function return will do - return nil - end - - type = LanItems.GetCurrentType() - # s390 does not have type yet set, but it can be read from hwinfo - type = LanItems.Items.dig(LanItems.current, "hwinfo", "type") if !type || type.empty? - builder = Y2Network::InterfaceConfigBuilder.for(type) - builder.name = LanItems.GetCurrentName() - - # FIXME: This is for backward compatibility only - # dhclient needs to set just one dhcp enabled interface to - # DHCLIENT_SET_DEFAULT_ROUTE=yes. Otherwise interface is selected more - # or less randomly (bnc#868187). However, UI is not ready for such change yet. - # As it could easily happen that all interfaces are set to "no" (and - # default route is unrecheable in such case) this explicite setup was - # added. - LanItems.set_default_route = true - - if !DeviceReady( - Ops.get_string( - LanItems.getCurrentItem, - ["hwinfo", "dev_name"], - "" - ) - ) - Y2Network::Sequences::Interface.new.init_s390(builder) - return :redraw - end - end - - Y2Network::Sequences::Interface.new.edit(builder) - return :redraw - - when :delete - # warn user when device to delete has STARTMODE=nfsroot (bnc#433867) - devmap = LanItems.GetCurrentMap - if devmap && devmap["STARTMODE"] == "nfsroot" - if !Popup.YesNoHeadline( - Label.WarningMsg, - _("Device you select has STARTMODE=nfsroot. Really delete?") - ) - # y2r: cannot break from middle of switch - # but in this function return will do - return nil - end - end - - LanItems.DeleteItem - initOverview("") - end - end - if Builtins.size(LanItems.Items) == 0 - UI.ChangeWidget(:_hw_sum, :Value, "") - UI.ChangeWidget(Id(:edit), :Enabled, false) - UI.ChangeWidget(Id(:delete), :Enabled, false) - return nil - end - - nil - end - def ManagedDialog contents = VBox(HSquash(VBox("MANAGED", VSpacing(0.5), "IPV6"))) @@ -599,18 +298,6 @@ def MainDialog(init_tab) break if input_done?(ret) end - ret - end - - private - - def overview_buttons - ret = {} - - ret[:add] = Label.AddButton - ret[:edit] = Label.EditButton - ret[:delete] = Label.DeleteButton - ret end end From 56ee3fe0d3c754699a66e23649e9ddad2573199c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 17:44:20 +0200 Subject: [PATCH 260/471] use friendly name in overview widget --- src/lib/y2network/widgets/interfaces_table.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index b9b6ce95e..f137ac879 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -53,10 +53,12 @@ def items config = Yast::Lan.yast_config # TODO: handle unconfigured config.interfaces.map do |interface| + hwinfo = interface.hardware + friendly_name = hwinfo.exists? ? hwinfo.description : interface.name conn = config.connections.by_name(interface.name) [ interface.name, # first is ID in table - interface.name, # TODO: better name based on hwinfo? + friendly_name, # TODO: better name based on hwinfo? interface_protocol(conn), interface.name, "" From 11ac01102110633e2eed31c561680c1b9e6f78b2 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 17:54:29 +0200 Subject: [PATCH 261/471] improve description --- src/lib/y2network/widgets/interfaces_table.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index f137ac879..d5b5f1e9c 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -101,6 +101,16 @@ def create_description result << "BusID : " << hwinfo.busid << "
    " end end + connection = Yast::Lan.yast_config.connections.by_name(value) + if connection + result << _("Device Name: %s") % ifcfg_name + # TODO: start mode description. Ideally in startmode class + # TODO: ip overview + else + result << "

    " << + _("The device is not configured. Press Edit\nto configure.\n") << + "

    " + end result end From 5158b7b590bdce3928c16d18fcd2078537cb2204 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 18:00:11 +0200 Subject: [PATCH 262/471] add interfaces table test --- .../widgets/interfaces_table_test.rb | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/y2network/widgets/interfaces_table_test.rb diff --git a/test/y2network/widgets/interfaces_table_test.rb b/test/y2network/widgets/interfaces_table_test.rb new file mode 100644 index 000000000..f68ec7919 --- /dev/null +++ b/test/y2network/widgets/interfaces_table_test.rb @@ -0,0 +1,37 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/interfaces_table" + +Yast.import "Lan" + +describe Y2Network::Widgets::InterfacesTable do + subject { described_class.new(double(:"value=" => nil)) } + + before do + allow(Yast::Lan).to receive(:yast_config).and_return(double(interfaces: [], connections: [])) + allow(Yast::UI).to receive(:QueryWidget).and_return([]) + allow(subject).to receive(:create_description).and_return("") + end + + include_examples "CWM::Table" +end From f385e2ffd4c1c08cd4e473293a69f57491b735a5 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 29 Aug 2019 19:10:45 +0200 Subject: [PATCH 263/471] update todos --- src/lib/y2network/widgets/interfaces_table.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index d5b5f1e9c..d06704b88 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -49,16 +49,14 @@ def handle end def items - # TODO: unconfigured devices config = Yast::Lan.yast_config - # TODO: handle unconfigured config.interfaces.map do |interface| hwinfo = interface.hardware friendly_name = hwinfo.exists? ? hwinfo.description : interface.name conn = config.connections.by_name(interface.name) [ interface.name, # first is ID in table - friendly_name, # TODO: better name based on hwinfo? + friendly_name, interface_protocol(conn), interface.name, "" From f380234e906e540e78a26f703f6b96947a3777e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 10:39:16 +0100 Subject: [PATCH 264/471] Use :none instead of nil when no renaming is done --- src/lib/y2network/interface.rb | 3 ++- src/lib/y2network/sysconfig/interfaces_reader.rb | 6 ++++-- test/y2network/interface_config_builder_test.rb | 2 +- test/y2network/sysconfig/interfaces_writer_test.rb | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 10c881133..282d8379b 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -48,7 +48,7 @@ class Interface attr_reader :configured # @return [HwInfo] attr_reader :hardware - # @return [Symbol] Mechanism to rename the interface (nil -no rename-, :bus_id or :mac) + # @return [Symbol] Mechanism to rename the interface (:none -no rename-, :bus_id or :mac) attr_accessor :renaming_mechanism # @return [String,nil] attr_reader :old_name @@ -78,6 +78,7 @@ def initialize(name, type: InterfaceType::ETHERNET) @name = name @description = "" @type = type + @renaming_mechanism = :none # @hardware and @name should not change during life of the object @hardware = Hwinfo.for(name) diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index efbf783fc..9a220a679 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -151,14 +151,16 @@ def add_interface(name, conn) # Detects the renaming mechanism used by the interface # # @param name [String] Interface's name - # @return [Symbol,nil] :mac (MAC address), :bus_id (BUS ID) or nil (no renaming) + # @return [Symbol] :mac (MAC address), :bus_id (BUS ID) or :none (no renaming) def renaming_mechanism_for(name) rule = UdevRule.find_for(name) - return nil unless rule + return :none unless rule if rule.parts.any? { |p| p.key == "ATTR{address}" } :mac elsif rule.parts.any? { |p| p.key == "KERNELS" } :bus_id + else + :none end end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 315aaf409..78d59ff52 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -146,7 +146,7 @@ it "returns false" do config_builder.rename_interface("eth0") - config_builder.renaming_mechanism = nil + config_builder.renaming_mechanism = :none expect(config_builder.renamed_interface?).to eq(false) end end diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index a0970b5fe..dfd2fa1f1 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -35,7 +35,7 @@ let(:hardware) do instance_double(Y2Network::Hwinfo, busid: "00:1c.0", mac: "01:23:45:67:89:ab", dev_port: "1") end - let(:renaming_mechanism) { nil } + let(:renaming_mechanism) { :none } let(:scr_root) { Dir.mktmpdir } before do From 0bf4a53170a2dac02bab6a7d81ca5d14433f8648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 10:49:58 +0100 Subject: [PATCH 265/471] InterfaceConfigBuilder#name= sets the interface too if it exists --- src/lib/y2network/interface_config_builder.rb | 44 ++++++++++++++----- .../interface_config_builder_test.rb | 12 ++++- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index b7e7bb067..4f7f699a4 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -54,13 +54,15 @@ def self.for(type, config: nil) end # @return [String] Device name (eth0, wlan0, etc.) - attr_accessor :name + attr_reader :name # @return [Y2Network::InterfaceType] type of @see Y2Network::Interface which is intended to be build attr_accessor :type # @return [Y2Network::ConnectionConfig] connection config on which builder operates attr_reader :connection_config - # @return [Symbol,nil] Mechanism to rename the interface (no hardware based, :mac or :bus_id) + # @return [Symbol] Mechanism to rename the interface (:none -no hardware based-, :mac or :bus_id) attr_writer :renaming_mechanism + # @return [Y2Network::Interface,nil] Underlying interface if it exists + attr_reader :interface # Constructor # @@ -81,6 +83,17 @@ def initialize(type:, config: nil) end end + # Sets the interface name + # + # It initializes the interface using the given name if it exists + # + # @param value [String] Interface name + def name=(value) + @name = value + iface = find_interface + self.interface = iface if iface + end + def newly_added? @newly_added end @@ -126,7 +139,7 @@ def renamed_interface? # @param new_name [String] New interface's name def rename_interface(new_name) @old_name ||= name - self.name = new_name + @name = new_name end # Returns the current renaming mechanism @@ -136,15 +149,6 @@ def renaming_mechanism @renaming_mechanism || interface.renaming_mechanism end - # Returns the underlying interface - # - # If the interface has been renamed, take the old name into account. - # - # @return [Y2Network::Interface,nil] - def interface - @interface ||= yast_config.interfaces.by_name(@old_name || name) - end - # how many device names is proposed NEW_DEVICES_COUNT = 10 # Proposes bunch of possible names for interface @@ -414,6 +418,22 @@ def save_aliases_to_connection end end + # Sets the interface for the builder + # + # @param iface [Interface] Interface to associate the builder with + def interface=(iface) + @interface = iface + @renaming_mechanism ||= @interface.renaming_mechanism + end + + # Returns the underlying interface + # + # @return [Y2Network::Interface,nil] + def find_interface + return nil unless yast_config # in some tests, it could return nil + yast_config.interfaces.by_name(name) + end + # Helper method to access to the current configuration # # @return [Y2Network::Config] diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 78d59ff52..31b41baa3 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -112,10 +112,20 @@ end describe "#renamed_interface?" do - context "when the interface has been renamed" do + context "when the interface name has not been changed" do it "returns false" do expect(config_builder.renamed_interface?).to eq(false) end + + context "but it was initially renamed by udev" do + before do + allow(eth0).to receive(:renaming_mechanism).and_return(:mac) + end + + it "returns false" do + expect(config_builder.renamed_interface?).to eq(false) + end + end end context "when the interface has been renamed" do From 35213cd142bc2aef1d6d630add3dfa749b70f8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 11:18:52 +0100 Subject: [PATCH 266/471] Do not validate whether an interface name exists if not changed --- src/lib/y2network/widgets/interface_name.rb | 3 ++- test/y2network/widgets/interface_name_test.rb | 24 +++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/widgets/interface_name.rb b/src/lib/y2network/widgets/interface_name.rb index a3eaa7671..007cace84 100644 --- a/src/lib/y2network/widgets/interface_name.rb +++ b/src/lib/y2network/widgets/interface_name.rb @@ -30,6 +30,7 @@ def initialize(settings) textdomain "network" @settings = settings + @old_name = @settings.name end def label @@ -57,7 +58,7 @@ def items end def validate - if @settings.name_exists?(value) + if @old_name != value && @settings.name_exists?(value) Yast::Popup.Error( format(_("Configuration name %s already exists.\nChoose a different one."), value) ) diff --git a/test/y2network/widgets/interface_name_test.rb b/test/y2network/widgets/interface_name_test.rb index 43ac20244..454e3b950 100644 --- a/test/y2network/widgets/interface_name_test.rb +++ b/test/y2network/widgets/interface_name_test.rb @@ -52,12 +52,26 @@ expect(subject.validate).to be false end - it "fails for already used names" do - allow(subject).to receive(:value).and_return valid_name - allow(Yast::NetworkInterfaces).to receive(:List).and_return [valid_name] + context "when the name is already used" do + before do + allow(subject).to receive(:value).and_return valid_name + allow(Yast::NetworkInterfaces).to receive(:List).and_return [valid_name] + end - expect(Yast::UI).to receive(:SetFocus) - expect(subject.validate).to be false + context "if the name was changed" do + let(:valid_name) { "eth1" } + + it "fails" do + expect(Yast::UI).to receive(:SetFocus) + expect(subject.validate).to be false + end + end + + context "if the name was not changed" do + it "passes" do + expect(subject.validate).to eq(true) + end + end end end From 038740c4dacc52686f6edfe837de1a4ee6412edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 11:26:45 +0100 Subject: [PATCH 267/471] Fix InterfaceNaming test --- test/y2network/widgets/interface_naming_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/y2network/widgets/interface_naming_test.rb b/test/y2network/widgets/interface_naming_test.rb index 944e5428b..032090f74 100644 --- a/test/y2network/widgets/interface_naming_test.rb +++ b/test/y2network/widgets/interface_naming_test.rb @@ -30,7 +30,8 @@ let(:builder) do instance_double( Y2Network::InterfaceConfigBuilder, - interface: interface + interface: interface, + name: "eth0" ) end From 43afaa36f5d7ef825cd8ae0e56c2a7f687342420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 12:16:22 +0100 Subject: [PATCH 268/471] Fix interfaces table description --- src/lib/y2network/widgets/interfaces_table.rb | 6 +- .../widgets/interfaces_table_test.rb | 98 ++++++++++++++++++- 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index d06704b88..1a24473ce 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -92,16 +92,16 @@ def create_description result << "(" << _("No hardware information") << ")
    " else result << "(" << _("Not connected") << ")
    " if !hwinfo.link - if !hwinfo.mac.empty? + if hwinfo.mac result << "MAC : " << hwinfo.mac << "
    " end - if !hwinfo.busid.empty? + if hwinfo.busid result << "BusID : " << hwinfo.busid << "
    " end end connection = Yast::Lan.yast_config.connections.by_name(value) if connection - result << _("Device Name: %s") % ifcfg_name + result << _("Device Name: %s") % connection.name # TODO: start mode description. Ideally in startmode class # TODO: ip overview else diff --git a/test/y2network/widgets/interfaces_table_test.rb b/test/y2network/widgets/interfaces_table_test.rb index f68ec7919..f5b821261 100644 --- a/test/y2network/widgets/interfaces_table_test.rb +++ b/test/y2network/widgets/interfaces_table_test.rb @@ -25,13 +25,105 @@ Yast.import "Lan" describe Y2Network::Widgets::InterfacesTable do - subject { described_class.new(double(:"value=" => nil)) } + subject { described_class.new(description) } + + let(:description) { double(:value= => nil) } + + let(:eth0) { instance_double(Y2Network::Interface, name: "eth0", hardware: hwinfo) } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } + let(:hwinfo) do + instance_double(Y2Network::Hwinfo, link: link, mac: mac, busid: busid, exists?: exists?, description: "") + end + let(:mac) { "01:23:45:67:89:ab" } + let(:busid) { "0000:04:00.0" } + let(:link) { false } + let(:exists?) { true } + let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn]) } + let(:eth0_conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } + end + before do - allow(Yast::Lan).to receive(:yast_config).and_return(double(interfaces: [], connections: [])) + allow(Yast::Lan).to receive(:yast_config).and_return(double(interfaces: interfaces, connections: connections)) allow(Yast::UI).to receive(:QueryWidget).and_return([]) - allow(subject).to receive(:create_description).and_return("") + allow(subject).to receive(:value).and_return("eth0") + # allow(subject).to receive(:create_description).and_return("") end include_examples "CWM::Table" + + describe "#handle" do + + it "updates the description" do + expect(description).to receive(:value=) + subject.handle + end + + it "includes the MAC address in the description" do + expect(description).to receive(:value=).with(/MAC/) + subject.handle + end + + context "when there is no MAC address" do + let(:mac) { nil } + + it "does not include the MAC in the description" do + expect(description).to receive(:value=) do |text| + expect(text).to_not include("MAC") + end + subject.handle + end + end + + it "includes the Bus ID address in the description" do + expect(description).to receive(:value=).with(/BusID/) + subject.handle + end + + context "when there is no Bus ID" do + let(:busid) { nil } + + it "does not include the Bus ID in the description" do + expect(description).to receive(:value=) do |text| + expect(text).to_not include("BusID") + end + subject.handle + end + end + + context "when there is no hardware information" do + let(:exists?) { false } + + it "sets the description with 'no hardware information' warning" do + expect(description).to receive(:value=).with(/No hardware information/) + subject.handle + end + end + + context "when there is no link" do + let(:link) { false } + + it "sets includes a 'Not connected' text" do + expect(description).to receive(:value=).with(/Not connected/) + subject.handle + end + end + + context "when the device is configured" do + it "includes its device name in the description" do + expect(description).to receive(:value=).with(/Device Name: eth0/) + subject.handle + end + end + + context "when the device is not configured" do + let(:connections) { Y2Network::ConnectionConfigsCollection.new([]) } + + it "includes a warning in the description" do + expect(description).to receive(:value=).with(/The device is not configured./) + subject.handle + end + end + end end From 4726b55f674236025becb5462037c2bb8703a5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 12:34:38 +0100 Subject: [PATCH 269/471] Fix params alignment --- test/y2network/widgets/interface_naming_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/y2network/widgets/interface_naming_test.rb b/test/y2network/widgets/interface_naming_test.rb index 032090f74..26d65f586 100644 --- a/test/y2network/widgets/interface_naming_test.rb +++ b/test/y2network/widgets/interface_naming_test.rb @@ -31,7 +31,7 @@ instance_double( Y2Network::InterfaceConfigBuilder, interface: interface, - name: "eth0" + name: "eth0" ) end From 0dfee5c322f34af08136cdce57b4fe37f2f1273c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 12:39:09 +0100 Subject: [PATCH 270/471] Make RuboCop happy --- src/lib/y2network/widgets/interfaces_table.rb | 8 ++------ test/y2network/widgets/interfaces_table_test.rb | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 1a24473ce..56314d863 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -92,12 +92,8 @@ def create_description result << "(" << _("No hardware information") << ")
    " else result << "(" << _("Not connected") << ")
    " if !hwinfo.link - if hwinfo.mac - result << "MAC : " << hwinfo.mac << "
    " - end - if hwinfo.busid - result << "BusID : " << hwinfo.busid << "
    " - end + result << "MAC : " << hwinfo.mac << "
    " if hwinfo.mac + result << "BusID : " << hwinfo.busid << "
    " if hwinfo.busid end connection = Yast::Lan.yast_config.connections.by_name(value) if connection diff --git a/test/y2network/widgets/interfaces_table_test.rb b/test/y2network/widgets/interfaces_table_test.rb index f5b821261..227f0b61a 100644 --- a/test/y2network/widgets/interfaces_table_test.rb +++ b/test/y2network/widgets/interfaces_table_test.rb @@ -43,12 +43,10 @@ Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } end - before do allow(Yast::Lan).to receive(:yast_config).and_return(double(interfaces: interfaces, connections: connections)) allow(Yast::UI).to receive(:QueryWidget).and_return([]) allow(subject).to receive(:value).and_return("eth0") - # allow(subject).to receive(:create_description).and_return("") end include_examples "CWM::Table" From 6e27628f6590d8398a25dfb74a95c01e466b2dc5 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 2 Sep 2019 15:26:35 +0200 Subject: [PATCH 271/471] create proposal and drop no longer needed defaults --- src/data/network/s390_defaults.yml | 11 - src/data/network/sysconfig_defaults.yml | 47 - src/include/network/lan/address.rb | 5 - src/include/network/lan/wireless.rb | 1420 ----------------- src/include/network/lan/wizards.rb | 1 - src/lib/y2network/connection_config/base.rb | 52 +- .../y2network/connection_config/bonding.rb | 2 +- .../y2network/connection_config/wireless.rb | 21 + src/lib/y2network/interface_config_builder.rb | 9 +- src/modules/Lan.rb | 15 - src/modules/LanItems.rb | 156 -- test/lan_items_read_test.rb | 105 -- test/wireless_test.rb | 49 - test/yaml_defaults_test.rb | 81 - 14 files changed, 77 insertions(+), 1897 deletions(-) delete mode 100644 src/data/network/s390_defaults.yml delete mode 100644 src/data/network/sysconfig_defaults.yml delete mode 100644 src/include/network/lan/wireless.rb delete mode 100755 test/lan_items_read_test.rb delete mode 100755 test/wireless_test.rb delete mode 100755 test/yaml_defaults_test.rb diff --git a/src/data/network/s390_defaults.yml b/src/data/network/s390_defaults.yml deleted file mode 100644 index d51d54f44..000000000 --- a/src/data/network/s390_defaults.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- # s390 configuration options -CHAN_MODE: '0' -QETH_PORTNAME: '' -QETH_PORTNUMBER: '' -QETH_OPTIONS: '' -QETH_LAYER2: 'no' -QETH_CHANIDS: '' -IPA_TAKEOVER: 'no' -IUCV_USER: '' -LLADDR: '00:00:00:00:00:00' - diff --git a/src/data/network/sysconfig_defaults.yml b/src/data/network/sysconfig_defaults.yml deleted file mode 100644 index f96a2573c..000000000 --- a/src/data/network/sysconfig_defaults.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- # generic sysconfig options -BOOTPROTO: static -IPADDR: '' -PREFIXLEN: '' -REMOTE_IPADDR: '' -NETMASK: '' -MTU: '' -ETHTOOL_OPTIONS: '' -NAME: '' -STARTMODE: '' -IFPLUGD_PRIORITY: '0' -WIRELESS_MODE: Managed -WIRELESS_ESSID: '' -WIRELESS_NWID: '' -WIRELESS_AUTH_MODE: open -WIRELESS_WPA_PSK: '' -WIRELESS_KEY_LENGTH: '128' -WIRELESS_KEY: '' -WIRELESS_KEY_0: '' -WIRELESS_KEY_1: '' -WIRELESS_KEY_2: '' -WIRELESS_KEY_3: '' -WIRELESS_DEFAULT_KEY: '0' -WIRELESS_NICK: '' -WIRELESS_CHANNEL: '' -WIRELESS_FREQUENCY: '' -WIRELESS_BITRATE: auto -WIRELESS_AP: '' -WIRELESS_POWER: '' -WIRELESS_EAP_MODE: 'PEAP' -WIRELESS_WPA_IDENTITY: '' -WIRELESS_WPA_PASSWORD: '' -WIRELESS_WPA_ANONID: '' -WIRELESS_CLIENT_CERT: '' -WIRELESS_CLIENT_KEY: '' -WIRELESS_CLIENT_KEY_PASSWORD: '' -WIRELESS_CA_CERT: '' -WIRELESS_EAP_AUTH: 'MSCHAPV2' -WIRELESS_PEAP_VERSION: '' -WIRELESS_AP_SCANMODE: '1' -BONDING_MODULE_OPTS: mode=active-backup miimon=100 -TUNNEL_SET_OWNER: '' -TUNNEL_SET_GROUP: '' -BRIDGE_PORTS: '' -BRIDGE: 'yes' -BRIDGE_STP: 'off' -BRIDGE_FORWARDDELAY: '0' diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index c0d29c69c..530293469 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -103,11 +103,6 @@ def AddressDialog(builder:) LanItems.add_device_to_routing if LanItems.update_routing_devices? end - # rollback if changes are canceled, as still some widgets edit LanItems directly - LanItems.Rollback if ret != :next - # proceed with WLAN settings if appropriate, #42420 - ret = :wire if ret == :next && builder.type.wireless? - log.info "AddressDialog res: #{ret.inspect}" ret end diff --git a/src/include/network/lan/wireless.rb b/src/include/network/lan/wireless.rb deleted file mode 100644 index 1d610bb63..000000000 --- a/src/include/network/lan/wireless.rb +++ /dev/null @@ -1,1420 +0,0 @@ -# encoding: utf-8 - -# *************************************************************************** -# -# Copyright (c) 2012 Novell, Inc. -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -# -# ************************************************************************** -# File: include/network/lan/wizards.ycp -# Package: Network configuration -# Summary: Network cards configuration wizards -# Authors: Michal Svec -# - -require "shellwords" - -module Yast - module NetworkLanWirelessInclude - def initialize_network_lan_wireless(include_target) - textdomain "network" - - Yast.import "CWM" - Yast.import "FileUtils" - Yast.import "Label" - Yast.import "Lan" - Yast.import "LanItems" - Yast.import "Map" - Yast.import "Message" - Yast.import "Popup" - Yast.import "String" - Yast.import "Wizard" - - Yast.include include_target, "network/routines.rb" - Yast.include include_target, "network/lan/help.rb" - - # key input type buttons - @type_w = RadioButtonGroup( - Id(:type_g), - VBox( - # Translators: input type for a wireless key - # radio button group label - Left(Label(_("Key Input Type"))), - Left( - HBox( - # Translators: input type for a wireless key - RadioButton(Id("passphrase"), _("&Passphrase")), - HSpacing(1), - # Translators: input type for a wireless key - RadioButton(Id("ascii"), _("&ASCII")), - HSpacing(1), - # Translators: input type for a wireless key - # (Hexadecimal) - RadioButton(Id("hex"), _("&Hexadecimal")) - ) - ) - ) - ) - - @wpa_eap_widget_descr = { - "WPA_EAP_MODE" => { - "widget" => :combobox, - # combo box label - "label" => _("EAP &Mode"), - "opt" => [:notify], - "items" => [ - # combo box item, one of WPA EAP modes - ["PEAP", _("PEAP")], - # combo box item, one of WPA EAP modes - ["TLS", _("TLS")], - # combo box item, one of WPA EAP modes - ["TTLS", _("TTLS")] - ], - "help" => _( - "

    WPA-EAP uses a RADIUS server to authenticate users. There\n" \ - "are different methods in EAP to connect to the server and\n" \ - "perform the authentication, namely TLS, TTLS, and PEAP.

    \n" - ), - "init" => fun_ref(method(:InitEapMode), "void (string)"), - "handle" => fun_ref(method(:HandleEapMode), "symbol (string, map)") - }, - # the four WPA_EAP_* widgets come together, so the helps are - # dipersed a bit - "WPA_EAP_IDENTITY" => { - "widget" => :textentry, - # text entry label - "label" => _("&Identity"), - "opt" => [], - "help" => _( - "

    For TTLS and PEAP, enter your Identity\n" \ - "and Password as configured on the server.\n" \ - "If you have special requirements to set the username used as\n" \ - "Anonymous Identity, you may set it here. This is usually not needed.

    \n" - ) - }, - "WPA_EAP_ANONID" => { - "widget" => :textentry, - # text entry label - "label" => _("&Anonymous Identity"), - "opt" => [], - "help" => "" - }, - "WPA_EAP_PASSWORD" => { - "widget" => :password, - # or password? - # text entry label - "label" => _("&Password"), - "opt" => [], - "help" => "" - }, - "WPA_EAP_CLIENT_CERT" => { - "widget" => :textentry, - # text entry label - "label" => _("&Client Certificate"), - "opt" => [], - "help" => _( - "

    TLS uses a Client Certificate instead of a username and\n" \ - "password combination for authentication. It uses a public and private key pair\n" \ - "to encrypt negotiation communication, therefore you will additionally need\n" \ - "a Client Key file that contains your private key and\n" \ - "the appropriate Client Key Password for that file.

    \n" - ), - "validate_type" => :function, - "validate_function" => fun_ref( - method(:ValidateFileExists), - "boolean (string, map)" - ) - }, - "WPA_EAP_CLIENT_KEY" => { - "widget" => :textentry, - # text entry label - "label" => _("Client &Key"), - "opt" => [], - "help" => "", - "validate_type" => :function, - "validate_function" => fun_ref( - method(:ValidateFileExists), - "boolean (string, map)" - ) - }, - "WPA_EAP_CLIENT_KEY_PASSWORD" => { - "widget" => :textentry, - # or password? - # text entry label - "label" => _( - "Client Key Pass&word" - ), - "opt" => [], - "help" => "" - }, - "WPA_EAP_CA_CERT" => { - "widget" => :textentry, - # text entry label - # aka certificate of the CA (certification authority) - "label" => _( - "&Server Certificate" - ), - "opt" => [], - "help" => _( - "

    To increase security, it is recommended to configure\n" \ - "a Server Certificate. It is used\n" \ - "to validate the server's authenticity.

    \n" - ), - "validate_type" => :function, - "validate_function" => fun_ref( - method(:ValidateCaCertExists), - "boolean (string, map)" - ) - }, - "WPA_EAP_CLIENT_CERT_BROWSE" => { - "widget" => :push_button, - "label" => "...", - "opt" => [:autoShortcut], - "help" => "", - "init" => fun_ref(CWM.method(:InitNull), "void (string)"), - "store" => fun_ref(CWM.method(:StoreNull), "void (string, map)"), - "handle" => fun_ref(method(:HandleFileBrowse), "symbol (string, map)") - }, - "WPA_EAP_CLIENT_KEY_BROWSE" => { - "widget" => :push_button, - "label" => "...", - "opt" => [:autoShortcut], - "help" => "", - "init" => fun_ref(CWM.method(:InitNull), "void (string)"), - "store" => fun_ref(CWM.method(:StoreNull), "void (string, map)"), - "handle" => fun_ref(method(:HandleFileBrowse), "symbol (string, map)") - }, - "WPA_EAP_CA_CERT_BROWSE" => { - "widget" => :push_button, - "label" => "...", - "opt" => [:autoShortcut], - "help" => "", - "init" => fun_ref(CWM.method(:InitNull), "void (string)"), - "store" => fun_ref(CWM.method(:StoreNull), "void (string, map)"), - "handle" => fun_ref(method(:HandleFileBrowse), "symbol (string, map)") - }, - "DETAILS_B" => { - "widget" => :push_button, - # push button label - "label" => _("&Details"), - "opt" => [], - "help" => "", - "init" => fun_ref(CWM.method(:InitNull), "void (string)"), - "store" => fun_ref(CWM.method(:StoreNull), "void (string, map)"), - "handle" => fun_ref(method(:HandleDetails), "symbol (string, map)") - }, - "WPA_EAP_DUMMY" => { - "widget" => :empty, - "help" => _( - "If you do not know your ID and password or you do not have\nany certificate or key files, contact your system administrator.\n" - ), - "init" => fun_ref(CWM.method(:InitNull), "void (string)"), - "store" => fun_ref( - CWM.method(:StoreNull), - "void (string, map)" - ), - "validate_type" => :function, - "validate_function" => fun_ref( - method(:ValidateWpaEap), - "boolean (string, map)" - ) - }, - # Details dialog - "WPA_EAP_AUTH" => { - "widget" => :combobox, - # combo box label - "label" => _("&Authentication Method"), - "help" => _( - "

    Here you can configure the inner authentication (also known as phase 2)\n" \ - "method. By default, all methods are allowed. If you want to restrict the\n" \ - "allowed methods or in case you have encountered difficulties regarding\n" \ - "authentication, choose your inner authentication method.

    \n" - ) - }, - "WPA_EAP_PEAP_VERSION" => { - "widget" => :radio_buttons, - # radio button group label - "label" => _("&PEAP Version"), - "help" => _( - "

    If you are using PEAP, you can also force the use of a specific PEAP\nimplementation (version 0 or 1). Normally this should not be necessary.

    \n" - ), - "items" => [ - # radio button: any version of PEAP - ["", _("&Any")], - ["0", "&0"], - ["1", "&1"] - ], - "init" => fun_ref(method(:InitPeapVersion), "void (string)") - } - } - end - - # Compose a typed key into a single-string representation - # @param [String] type "passphrase", "ascii", "hex" - # @param [String] key - # @return prefixed key - def ComposeWepKey(type, key) - # prefixes for key types - prefix = { "ascii" => "s:", "passphrase" => "h:", "hex" => "" } - - # empty key - don't prepend a type (#40431) - key == "" ? "" : Ops.add(Ops.get(prefix, type, "?:"), key) - end - - def ParseWepKey(tkey) - if Builtins.substring(tkey, 0, 2) == "s:" - { "key" => Builtins.substring(tkey, 2), "type" => "ascii" } - elsif Builtins.substring(tkey, 0, 2) == "h:" - { "key" => Builtins.substring(tkey, 2), "type" => "passphrase" } - # make passphrase the default key type, #40431 - elsif tkey == "" - { "key" => tkey, "type" => "passphrase" } - else - { "key" => tkey, "type" => "hex" } - end - end - - # Is the entered key valid? - # TODO: check according to the selected key length - # (or better adjust the length?) - # @param [Array] lengths allowed real key lengths - def CheckWirelessKey(key, lengths) - lengths = deep_copy(lengths) - return false if key.nil? - - if Builtins.regexpmatch(key, "^s:.{5}$") && Builtins.contains(lengths, 40) || - Builtins.regexpmatch(key, "^s:.{6,13}$") && - Builtins.contains(lengths, 104) - return true - end - - if Builtins.regexpmatch(key, "^[0-9A-Fa-f-]*$") - key = Builtins.deletechars(key, "-") - actual_bits = Ops.multiply(Builtins.size(key), 4) # 4 bits per hex digit - return true if Builtins.contains(lengths, actual_bits) - Builtins.y2milestone( - "Key length: actual %1, allowed %2", - actual_bits, - lengths - ) - end - - return true if Builtins.regexpmatch(key, "^h:") - - false - end - - # Takes the WEP items from the list and returns the key lengths as integers - # Like the input, uses the real length which is 24 bits shorter - # than the marketing one. - # If the input is nil, return the default set of key lengths. - # @param [Array] enc_modes a subset of WEP40, WEP104, WEP128, WEP232, TKIP, CCMP - # @return [Array] of real key lengths - def ParseKeyLengths(enc_modes) - enc_modes = deep_copy(enc_modes) - return [40, 104] if enc_modes.nil? - - lengths = [] - Builtins.foreach(enc_modes) do |em| - if Builtins.substring(em, 0, 3) == "WEP" - lengths = Builtins.add( - lengths, - Builtins.tointeger(Builtins.substring(em, 3)) - ) - end - end - - Builtins.y2warning("empty set of key lengths") if lengths == [] - deep_copy(lengths) - end - - # Make a list of ComboBox items for authentication mode. - # We must translate WPA-PSK: it is "wpa-psk" in hwinfo but "psk" in syconfig - # (#74496). - # @param [Array] authmodes allowed modes as returned by hwinfo. nil == don't know. - # @return combo box items - def AuthModeItems(authmodes) - authmodes = deep_copy(authmodes) - names = { - # Wireless authentication modes: - # ComboBox item - "no-encryption" => _( - "No Encryption" - ), - # ComboBox item - "open" => _("WEP - Open"), - # ComboBox item - "sharedkey" => _("WEP - Shared Key"), - # ComboBox item - # Ask me what it means, I don't know yet - "wpa-psk" => _( - "WPA-PSK (WPA version 1 or 2)" - ), - # ComboBox item - "wpa-eap" => _("WPA-EAP (WPA version 1 or 2)") - } - ids = { "wpa-psk" => "psk", "wpa-eap" => "eap" } - authmodes = if authmodes.nil? - Convert.convert( - Map.Keys(names), - from: "list", - to: "list " - ) - else - # keep only those that we know how to handle - Builtins.filter(authmodes) do |am| - Builtins.haskey(names, am) - end - end - Builtins.maplist(authmodes) do |am| - Item(Id(Ops.get(ids, am, am)), Ops.get(names, am, am)) - end - end - - # Wireless devices configuration dialog - # @return dialog result - def WirelessDialog - # Wireless dialog caption - caption = _("Wireless Network Card Configuration") - mode = LanItems.wl_mode - essid = LanItems.wl_essid - authmode = LanItems.wl_auth_mode - # wpa or wep? - authmode_wpa = authmode == "psk" || authmode == "eap" # shortcut - key = nil - type = nil - if authmode == "psk" - key = LanItems.wl_wpa_psk - type = Builtins.size(key) == 64 ? "hex" : "passphrase" - elsif authmode != "eap" - wkey = ParseWepKey( - Ops.get(LanItems.wl_key, LanItems.wl_default_key, "") - ) - key = Ops.get(wkey, "key", "") - type = Ops.get(wkey, "type", "") - else - key = "" # and type is not used - end - - key_lengths = ParseKeyLengths(LanItems.wl_enc_modes) - - # Wireless dialog contents - contents = HBox( - HSpacing(4), - VBox( - VSpacing(0.5), - # Frame label - Frame( - _("Wireless Device Settings"), - HBox( - HSpacing(2), - VBox( - VSpacing(0.5), - # ComboBox label - ComboBox( - Id(:mode), - Opt(:hstretch), - _("O&perating Mode"), - [ - # ComboBox item - Item(Id("Ad-hoc"), _("Ad-Hoc"), mode == "Ad-hoc"), - # ComboBox item - Item(Id("Managed"), _("Managed"), mode == "Managed"), - # ComboBox item - Item(Id("Master"), _("Master"), mode == "Master") - ] - ), - VSpacing(0.2), - # Text entry label - HBox( - ComboBox( - Id(:essid), - Opt(:editable), - _("Ne&twork Name (ESSID)"), - [essid] - ), - PushButton(Id(:scan_for_networks), _("Scan Network")) - ), - VSpacing(0.2), - ComboBox( - Id(:authmode), - Opt(:hstretch, :notify), - # ComboBox label - _("&Authentication Mode"), - AuthModeItems(LanItems.wl_auth_modes) - ), - VSpacing(0.2), - @type_w, - VSpacing(0.2), - # Text entry label - Password(Id(:key), _("&Encryption Key"), key), - VSpacing(0.5) - ), - HSpacing(2) - ) - ), - VSpacing(0.5), - HBox( - # PushButton label - PushButton(Id(:expert), _("E&xpert Settings")), - HSpacing(0.5), - # PushButton label, keys for WEP encryption - PushButton(Id(:keys), _("&WEP Keys")) - ), - VSpacing(0.5) - ), - HSpacing(4) - ) - Wizard.SetContentsButtons( - caption, - contents, - Builtins.sformat( - "%1%2%3", - Ops.get_string(@help, "wireless", ""), - Ops.get_string(@help, "wep_key", ""), - Ops.get_string(@help, "wpa", "") - ), - Label.BackButton, - Label.NextButton - ) - - # - # Situation with (E)SSID is not as clear as it should be. - # According IEEE 802.11-2007 it should be between 0 and 32 octets (sometimes including trailing \0). - # - # However, vendors can have additional limits. - # According http://www.cisco.com/web/techdoc/wireless/access_points/online_help/eag/123-04.JA/1400br/h_ap_sec_ap-client-security.html - # characters ?, ", $, [, \, ], + are disallowed. Moreover !, #, : shouldn't be at beginning of the id. - # As this is only part of vendor specification and an APs which breaks that rule (see http://www.wirelessforums.org/alt-internet-wireless/ssid-33892.html) - # this is ignored. - # - # Eventually, as a note to bnc#118157 and bnc#750325 an ' (apostrophe) is valid character in ESSID. - # - UI.ChangeWidget(Id(:essid), :ValidChars, String.CPrint) - - UI.ChangeWidget(Id(:authmode), :Value, authmode) - UI.ChangeWidget(Id(:type_g), :CurrentButton, type) if authmode != "eap" - - ckey = nil - ret = nil - loop do - UI.ChangeWidget(Id(:mode), :Value, "Managed") if authmode_wpa - - UI.ChangeWidget( - Id(:type_g), - :Enabled, - authmode != "no-encryption" && authmode != "eap" - ) - UI.ChangeWidget( - Id(:key), - :Enabled, - authmode != "no-encryption" && authmode != "eap" - ) - UI.ChangeWidget( - Id(:keys), - :Enabled, - authmode != "no-encryption" && !authmode_wpa - ) - UI.ChangeWidget( - Id("ascii"), - :Enabled, - authmode != "no-encryption" && authmode != "psk" - ) - - ret = UI.UserInput - - authmode = Convert.to_string(UI.QueryWidget(Id(:authmode), :Value)) - authmode_wpa = authmode == "psk" || authmode == "eap" # shortcut - - case ret - when :abort, :cancel - if ReallyAbort() - LanItems.Rollback() - break - end - - next - when :back - break - when :next, :expert, :keys - mode = Convert.to_string(UI.QueryWidget(Id(:mode), :Value)) - # WPA-PSK and WPA-EAP are only allowed for Managed mode - if authmode_wpa && mode != "Managed" - UI.SetFocus(Id(:mode)) - # Popup text - Popup.Error( - _( - "WPA authentication mode is only possible in managed operating mode." - ) - ) - next - end - essid = Convert.to_string(UI.QueryWidget(Id(:essid), :Value)) - if essid == "" && (mode != "Managed" || authmode_wpa) - UI.SetFocus(Id(:essid)) - # Popup text - # modes: combination of operation and authentication - Popup.Error(_("Specify the network name for this mode.")) - next - end - if Ops.greater_than(Builtins.size(essid), 32) - UI.SetFocus(Id(:essid)) - # Popup text - Popup.Error( - _("The network name must be shorter than 32 characters.") - ) - next - end - - if authmode != "no-encryption" && authmode != "eap" - key = Convert.to_string(UI.QueryWidget(Id(:key), :Value)) - else - key = "" - Ops.set(LanItems.wl_key, LanItems.wl_default_key, "") - LanItems.wl_wpa_psk = "" - end - type = Convert.to_string(UI.QueryWidget(Id(:type_g), :CurrentButton)) - if authmode == "psk" - sz = Builtins.size(key) - if type == "passphrase" && - (Ops.less_than(sz, 8) || Ops.greater_than(sz, 63)) - UI.SetFocus(Id(:key)) - # Error popup - Popup.Error( - _( - "The passphrase must have between 8 and 63 characters (inclusively)." - ) - ) - next - elsif type == "hex" && - !Builtins.regexpmatch(key, "^[0-9A-Fa-f]{64}$") - UI.SetFocus(Id(:key)) - # Error popup - Popup.Error( - Builtins.sformat( - _("The key must have %1 hexadecimal digits."), - 64 - ) - ) - next - end - elsif !authmode_wpa - ckey = ComposeWepKey(type, key) - if ckey != "" - if !CheckWirelessKey(ckey, key_lengths) - UI.SetFocus(Id(:key)) - # Popup text - Popup.Error(_("The encryption key is invalid.")) - next - end - else - UI.SetFocus(Id(:key)) - if authmode == "sharedkey" # error - # Popup text - Popup.Error( - _( - "The encryption key must be specified for this authentication mode." - ) - ) - next - elsif ret != :keys # warning only - # Popup text - pop = _( - "Using no encryption is a security risk.\nReally continue?\n" - ) - next if !Popup.YesNo(pop) - end - end - end - break - when :scan_for_networks - if scan_supported? - command = Builtins.sformat( - "/usr/sbin/ip link set %1 up && /usr/sbin/iwlist %1 scan | " \ - "/usr/bin/grep ESSID | /usr/bin/cut -d':' -f2 | " \ - "/usr/bin/cut -d'\"' -f2 | /usr/bin/sort -u", - Ops.get_string(LanItems.Items, [LanItems.current, "ifcfg"], "").shellescape - ) - output = Convert.convert( - SCR.Execute(path(".target.bash_output"), command), - from: "any", - to: "map " - ) - - if Ops.get_integer(output, "exit", -1) == 0 - networks = Builtins.splitstring( - Ops.get_string(output, "stdout", ""), - "\n" - ) - Builtins.y2milestone("Found networks : %1", networks) - UI.ChangeWidget(:essid, :Items, networks) - end - end - when :authmode - # do nothing - else - Builtins.y2error("Unexpected return code: %1", ret) - next - end - end - - if ret == :next || ret == :expert || ret == :keys - LanItems.wl_essid = Convert.to_string( - UI.QueryWidget(Id(:essid), :Value) - ) - LanItems.wl_mode = mode - LanItems.wl_auth_mode = authmode - if authmode == "psk" - LanItems.wl_wpa_psk = key - Ops.set(LanItems.wl_key, LanItems.wl_default_key, "") - elsif !authmode_wpa && authmode != "no-encryption" - Ops.set(LanItems.wl_key, LanItems.wl_default_key, ckey) - LanItems.wl_wpa_psk = "" - end - end - - if ret == :next && authmode == "eap" - ret = :eap # continue by the WPA-EAP dialog - end - deep_copy(ret) - end - - # Wireless expert configuration dialog - # @return dialog result - def WirelessExpertDialog - # Wireless expert dialog caption - caption = _("Wireless Expert Settings") - - # Wireless expert dialog help 1/5 - helptext = _( - "

    Here, set additional configuration parameters\n(rarely needed).

    " - ) + - # Wireless expert dialog help 2/5 - _( - "

    To use your wireless LAN card in master or ad-hoc mode,\n" \ - "set the Channel the card should use here. This is not needed\n" \ - "for managed mode--the card will hop through the channels searching for access\n" \ - "points in that case.

    \n" - ) + - # Wireless expert dialog help 3/5 - _( - "

    In some rare cases, you may want to set a transmission\nBit Rate explicitly. The default is to go as fast as possible.

    " - ) + - # Wireless expert dialog help 4/5 - _( - "

    In an environment with multiple Access Points, you may want to\ndefine the one to which to connect by entering its MAC address.

    " - ) + - # Wireless expert dialog help 5/5 - _( - "

    Use Power Management enables power saving mechanisms.\n" \ - "This is generally a good idea, especially if you are a laptop user and may\n" \ - "be disconnected from AC power.

    \n" - ) - - channels = [ - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14" - ] - channels = deep_copy(LanItems.wl_channels) if !LanItems.wl_channels.nil? - if LanItems.wl_channel != "" && - !Builtins.contains(channels, LanItems.wl_channel) - channels = Builtins.prepend(channels, LanItems.wl_channel) - end - # Combobox item - channels = Builtins.prepend(channels, Item(Id(""), _("Automatic"))) - - bitrates = [ - "54", - "48", - "36", - "24", - "18", - "12", - "11", - "9", - "6", - "5.5", - "2", - "1" - ] - bitrates = deep_copy(LanItems.wl_bitrates) if !LanItems.wl_bitrates.nil? - if LanItems.wl_bitrate != "" && - !Builtins.contains(bitrates, LanItems.wl_bitrate) - bitrates = Builtins.prepend(bitrates, LanItems.wl_bitrate) - end - # Combobox item - bitrates = Builtins.prepend(bitrates, Item(Id(""), _("Automatic"))) - - # Wireless expert dialog contents - contents = HBox( - HSpacing(4), - VBox( - VSpacing(0.5), - # Frame label - Frame( - _("Wireless Expert Settings"), - HBox( - HSpacing(2), - VBox( - VSpacing(1), - # Combobox label - ComboBox(Id(:channel), Opt(:hstretch), _("&Channel"), channels), - VSpacing(0.2), - # Combobox label - ComboBox(Id(:bitrate), Opt(:hstretch), _("B&it Rate"), bitrates), - VSpacing(0.2), - # Text entry label - InputField( - Id(:accesspoint), - Opt(:hstretch), - _("&Access Point"), - LanItems.wl_accesspoint - ), - VSpacing(0.2), - # CheckBox label - Left( - CheckBox( - Id(:power), - _("Use &Power Management"), - LanItems.wl_power == true - ) - ), - VSpacing(0.2), - Left( - IntField( - Id(:ap_scanmode), - Opt(:hstretch), - _("AP ScanMode"), - 0, - 2, - Builtins.tointeger(LanItems.wl_ap_scanmode) - ) - ), - VSpacing(1) - ), - HSpacing(2) - ) - ), - VSpacing(0.5) - ), - HSpacing(4) - ) - - Wizard.SetContentsButtons( - caption, - contents, - helptext, - Label.BackButton, - Label.OKButton - ) - - UI.ChangeWidget(Id(:bitrate), :Value, LanItems.wl_bitrate) - UI.ChangeWidget(Id(:channel), :Value, LanItems.wl_channel) - # #88530 - channel_changeable = Builtins.contains( - ["Ad-hoc", "Master"], - LanItems.wl_mode - ) - UI.ChangeWidget(Id(:channel), :Enabled, channel_changeable) - - ret = nil - loop do - ret = UI.UserInput - - case ret - when :abort, :cancel - if ReallyAbort() - LanItems.Rollback() - break - end - - next - when :back - break - when :next - # Check - break - else - Builtins.y2error("Unexpected return code: %1", ret) - next - end - end - - if ret == :next - LanItems.wl_channel = Convert.to_string( - UI.QueryWidget(Id(:channel), :Value) - ) - # LanItems::wl_frequency = (string) UI::QueryWidget(`id(`frequency), `Value); - LanItems.wl_bitrate = Convert.to_string( - UI.QueryWidget(Id(:bitrate), :Value) - ) - LanItems.wl_accesspoint = Convert.to_string( - UI.QueryWidget(Id(:accesspoint), :Value) - ) - LanItems.wl_power = Convert.to_boolean( - UI.QueryWidget(Id(:power), :Value) - ) == true - LanItems.wl_ap_scanmode = Builtins.tostring( - UI.QueryWidget(Id(:ap_scanmode), :Value) - ) - end - - deep_copy(ret) - end - - # Used to add or edit a key - # @param [String] tkey has s: for ascii or h: for passphrase - # @param [Array] lengths allowed real key lengths - def WirelessKeyPopup(tkey, lengths) - lengths = deep_copy(lengths) - wkey = ParseWepKey(tkey) - key = Ops.get(wkey, "key", "") - type = Ops.get(wkey, "type", "") - - contents = HBox( - HSpacing(1), - VBox( - VSpacing(0.2), - # Translators: popup dialog heading - Heading(_("Enter Encryption Key")), - @type_w, # common with the main dialog - VSpacing(0.5), - # Translators: text entry label - Left(TextEntry(Id(:key), _("&Key"), key)), - VSpacing(0.2), - HBox( - PushButton(Id(:ok), Opt(:default, :key_F10), Label.OKButton), - PushButton(Id(:cancel), Opt(:key_F9), Label.CancelButton), - PushButton(Id(:help), Opt(:key_F1), Label.HelpButton) - ), - VSpacing(0.2) - ), - HSpacing(1) - ) - - UI.OpenDialog(Opt(:decorated), contents) - UI.ChangeWidget(Id(:type_g), :CurrentButton, type) - UI.SetFocus(Id(:key)) - - ret = nil - ckey = nil - loop do - ret = UI.UserInput - - if ret == :help - # Translators: popup title - Popup.LongText( - _("Help"), - RichText(Ops.get_string(@help, "wep_key", "")), - 50, - 18 - ) - elsif ret == :cancel - break - elsif ret == :ok - key = Convert.to_string(UI.QueryWidget(Id(:key), :Value)) - type = Convert.to_string(UI.QueryWidget(Id(:type_g), :CurrentButton)) - ckey = ComposeWepKey(type, key) - break if CheckWirelessKey(ckey, lengths) - UI.SetFocus(Id(:key)) - # Popup text - Popup.Error(_("The encryption key is invalid.")) - else - Builtins.y2error("Unexpected return code: %1", ret) - end - end - - tkey = ckey if ret == :ok - - UI.CloseDialog - - tkey - end - - # Generate items for the keys table - def WirelessKeysItems(keys, defaultk) - keys = deep_copy(keys) - Builtins.maplist([0, 1, 2, 3]) do |i| - Item(Id(i), i, Ops.get(keys, i, ""), i == defaultk ? "*" : "") - end - end - - # In case the current default key is empty, find a nonempty one - # or the first one. - def FindGoodDefault(keys, defaultk) - keys = deep_copy(keys) - return defaultk if Ops.get(keys, defaultk, "") != "" - defaultk = Builtins.find([0, 1, 2, 3]) { |i| Ops.get(keys, i, "") != "" } - defaultk = 0 if defaultk.nil? - defaultk - end - - # Wireless expert configuration dialog - # @return dialog result - def WirelessKeysDialog - # Wireless keys dialog caption - caption = _("Wireless Keys") - - # Wireless keys dialog help 1/3 - helptext = _( - "

    In this dialog, define your WEP keys used\n" \ - "to encrypt your data before it is transmitted. You can have up to four keys,\n" \ - "although only one key is used to encrypt the data. This is the default key.\n" \ - "The other keys can be used to decrypt data. Usually you have only\n" \ - "one key.

    " - ) + - # Wireless keys dialog help 2/3 - _( - "

    Key Length defines the bit length of your WEP keys.\n" \ - "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" \ - "Some older hardware might not be able to handle 128 bit keys, so if your\n" \ - "wireless LAN connection does not establish, you may need to set this\n" \ - "value to 64.

    " - ) + "" - - length = LanItems.wl_key_length - ui_key_lengths = Builtins.maplist(ParseKeyLengths(LanItems.wl_enc_modes)) do |kl| - Builtins.tostring(Ops.add(kl, 24)) - end - if !Builtins.contains(ui_key_lengths, length) - ui_key_lengths = Builtins.add(ui_key_lengths, length) - end - keys = deep_copy(LanItems.wl_key) - defaultk = FindGoodDefault(keys, LanItems.wl_default_key) - - # Wireless keys dialog contents - contents = HBox( - HSpacing(5), - VBox( - VSpacing(1), - # Frame label - Frame( - _("WEP Keys"), - HBox( - HSpacing(3), - VBox( - VSpacing(1), - # ComboBox label - Left(ComboBox(Id(:length), _("&Key Length"), ui_key_lengths)), - VSpacing(1), - Table( - Id(:table), - Opt(:notify), - Header( - # Table header label - # Abbreviation of Number - _("No."), - # Table header label - _("Key"), - # Table header label - Center(_("Default")) - ), - WirelessKeysItems(keys, defaultk) - ), - HBox( - # PushButton label - PushButton(Id(:edit), Label.EditButton), - # PushButton label - PushButton(Id(:delete), Label.DeleteButton), - # PushButton label - PushButton(Id(:default), _("&Set as Default")) - ), - VSpacing(1) - ), - HSpacing(3) - ) - ), - VSpacing(1) - ), - HSpacing(5) - ) - - Wizard.SetContentsButtons( - caption, - contents, - helptext, - Label.BackButton, - Label.OKButton - ) - - UI.ChangeWidget(Id(:length), :Value, length) - - current = Convert.to_integer(UI.QueryWidget(Id(:table), :CurrentItem)) - - ret = nil - loop do - Builtins.foreach([:edit, :delete, :default]) do |btn| - UI.ChangeWidget(Id(btn), :Enabled, !current.nil?) - end - - UI.SetFocus(Id(:table)) - ret = UI.UserInput - - current = Convert.to_integer(UI.QueryWidget(Id(:table), :CurrentItem)) - length = Convert.to_string(UI.QueryWidget(Id(:length), :Value)) - rlength = Ops.subtract(Builtins.tointeger(length), 24) - - case ret - when :abort, :cancel - if ReallyAbort() - LanItems.Rollback() - break - end - - next - when :table, :edit, :delete - Ops.set( - keys, - current, - if ret != :delete - WirelessKeyPopup(Ops.get(keys, current, ""), [rlength]) - else - "" - end - ) - defaultk = FindGoodDefault(keys, defaultk) - UI.ChangeWidget(Id(:table), :Items, WirelessKeysItems(keys, defaultk)) - when :default - defaultk = FindGoodDefault(keys, current) - UI.ChangeWidget(Id(:table), :Items, WirelessKeysItems(keys, defaultk)) - when :next, :back - break - else - Builtins.y2error("Unexpected return code: %1", ret) - next - end - end - - if ret == :next - LanItems.wl_key_length = length - LanItems.wl_key = deep_copy(keys) - LanItems.wl_default_key = defaultk - end - - deep_copy(ret) - end - - # -------------------- WPA EAP -------------------- - - # `RadioButtonGroup uses CurrentButton instead of Value, grrr - # @param [String] key widget id - # @return what property to ask for to get the widget value - def ValueProp(key) - if UI.QueryWidget(Id(key), :WidgetClass) == "YRadioButtonGroup" - return :CurrentButton - end - :Value - end - - # function to initialize widgets - # @param [String] key widget id - def InitializeWidget(key) - # the "" serves instead of a default constructor for wl_wpa_eap - value = Ops.get_string(LanItems.wl_wpa_eap, key, "") - UI.ChangeWidget(Id(key), ValueProp(key), value) - - nil - end - - # function to store data from widget - # @param [String] key widget id - # @param [Hash] _event unused - def StoreWidget(key, _event) - value = UI.QueryWidget(Id(key), ValueProp(key)) - Ops.set(LanItems.wl_wpa_eap, key, value) - - nil - end - - # Event handler for EAP mode: - # enable or disable appropriate widgets - # @param key [String] the widget receiving the event - # @param _event [Hash] the event being handled - # @return nil so that the dialog loops on - def HandleEapMode(key, _event) - tls = UI.QueryWidget(Id(key), :Value) == "TLS" - Builtins.foreach(["WPA_EAP_PASSWORD", "WPA_EAP_ANONID", "DETAILS_B"]) do |id| - UI.ChangeWidget(Id(id), :Enabled, !tls) - end - Builtins.foreach( - [ - "WPA_EAP_CLIENT_CERT", - "WPA_EAP_CLIENT_CERT_BROWSE", - "WPA_EAP_CLIENT_KEY", - "WPA_EAP_CLIENT_KEY_BROWSE", - "WPA_EAP_CLIENT_KEY_PASSWORD" - ] - ) { |id| UI.ChangeWidget(Id(id), :Enabled, tls) } - nil - end - - # function to initialize widgets - # @param [String] key widget id - def InitEapMode(key) - # inherited - InitializeWidget(key) - # enable/disable - HandleEapMode(key, "ID" => "_cwm_wakeup") - - nil - end - - # function to initialize widgets - # @param [String] key widget id - def InitPeapVersion(key) - # inherited - InitializeWidget(key) - # enable/disable - mode = Ops.get_string(LanItems.wl_wpa_eap, "WPA_EAP_MODE", "") - UI.ChangeWidget(Id(key), :Enabled, mode.casecmp("peap").zero?) - - nil - end - - # Called when one of the two file browser buttons is pressed - # @param [String] key widget id - # @param [Hash] event ? - # @return nil so that the dialog does not exit - def HandleFileBrowse(key, event) - event = deep_copy(event) - # only process our own events - return nil if Ops.get(event, "ID") != key - - # convert to the text entry widget we belong to - attached_to = { - "WPA_EAP_CLIENT_CERT_BROWSE" => "WPA_EAP_CLIENT_CERT", - "WPA_EAP_CLIENT_KEY_BROWSE" => "WPA_EAP_CLIENT_KEY", - "WPA_EAP_CA_CERT_BROWSE" => "WPA_EAP_CA_CERT" - } - key = Ops.get_string(attached_to, key, "") - - # get the file and its directory if already entered - file = Convert.to_string(UI.QueryWidget(Id(key), :Value)) - slashpos = Builtins.findlastof(file, "/") - defaultd = "." # "/etc/cert"; - dir = slashpos.nil? ? defaultd : Builtins.substring(file, 0, slashpos) - - # file browser dialog headline - file = UI.AskForExistingFile(dir, "*", _("Choose a Certificate")) - - if !file.nil? - # fill the value - UI.ChangeWidget(Id(key), :Value, file) - end - nil - end - - # Remap the buttons to their Wizard Sequencer values - # @param _key [String] the widget receiving the event - # @param event [Hash] the event being handled - # @return nil so that the dialog loops on - def HandleDetails(_key, event) - event = deep_copy(event) - return :details if Ops.get(event, "ID") == "DETAILS_B" - nil - end - - # Called to validate that the file entered exists - # @param key [String] widget id - # @param _event [Hash] the event being handled - # @return ok? - def ValidateFileExists(key, _event) - file = Convert.to_string(UI.QueryWidget(Id(key), :Value)) - - if file == "" - return true # validated in ValidateWpaEap - end - - return true if FileUtils.Exists(file) - - UI.SetFocus(Id(key)) - Popup.Error(Message.CannotOpenFile(file)) - false - end - - def ValidateCaCertExists(key, event) - event = deep_copy(event) - ret = true - if Builtins.size(Convert.to_string(UI.QueryWidget(Id(key), :Value))) == 0 || - !ValidateFileExists(key, event) - if !Popup.YesNo( - _( - "Not using a Certificate Authority (CA) certificate can result in connections\nto insecure, rogue wireless networks. Continue without CA ?" - ) - ) - ret = false - end - end - ret - end - - # Called to validate that the whole dialog makes sense together - # @param _key [String] widget id - # @param _event [Hash] the event being handled - # @return ok? - def ValidateWpaEap(_key, _event) - tmp = Builtins.listmap( - [ - "WPA_EAP_IDENTITY", - # "WPA_EAP_PASSWORD", - "WPA_EAP_CLIENT_CERT" - ] - ) { |key2| { key2 => UI.QueryWidget(Id(key2), :Value) } } - - if Ops.get_string(tmp, "WPA_EAP_CLIENT_CERT", "") == "" && - Ops.get_string(tmp, "WPA_EAP_IDENTITY", "") == "" - UI.SetFocus(Id("WPA_EAP_IDENTITY")) - # error popup text - Popup.Error( - _( - "Enter either the identity and password\nor the client certificate." - ) - ) - return false - else - return true - end - end - - # Lays out a text entry and a push button, with proper alignment - def AddButton(id, button_id) - # return `HBox (id, button_id); - # needs new CWM - VSquash(HBox(id, Bottom(button_id))) # only for old UI? - end - - # Settings for WPA-EAP - # @return dialog result - def WirelessWpaEapDialog - contents = VBox( - "WPA_EAP_MODE", - "WPA_EAP_DUMMY", - HBox("WPA_EAP_IDENTITY", HSpacing(1), "WPA_EAP_PASSWORD"), - "WPA_EAP_ANONID", - AddButton("WPA_EAP_CLIENT_CERT", "WPA_EAP_CLIENT_CERT_BROWSE"), - HBox( - AddButton("WPA_EAP_CLIENT_KEY", "WPA_EAP_CLIENT_KEY_BROWSE"), - HSpacing(1), - "WPA_EAP_CLIENT_KEY_PASSWORD" - ), - AddButton("WPA_EAP_CA_CERT", "WPA_EAP_CA_CERT_BROWSE"), - VSpacing(1), - Right("DETAILS_B") - ) - - functions = { - "init" => fun_ref(method(:InitializeWidget), "void (string)"), - "store" => fun_ref(method(:StoreWidget), "void (string, map)"), - :abort => fun_ref(method(:ReallyAbort), "boolean ()") - } # undocumented, FIXME - - CWM.ShowAndRun( - "widget_descr" => @wpa_eap_widget_descr, - "contents" => contents, - # dialog caption - "caption" => _("WPA-EAP"), - "back_button" => Label.BackButton, - "next_button" => Label.NextButton, - "fallback_functions" => functions - ) - end - - # Detailed settings for WPA-EAP - # @return dialog result - def WirelessWpaEapDetailsDialog - contents = HSquash( - VBox("WPA_EAP_AUTH", VSpacing(1), "WPA_EAP_PEAP_VERSION") - ) - - functions = { - "init" => fun_ref(method(:InitializeWidget), "void (string)"), - "store" => fun_ref(method(:StoreWidget), "void (string, map)"), - :abort => fun_ref(method(:ReallyAbort), "boolean ()") - } - - auth_names = { - # combo box item, any of EAP authentication methods - "" => _("Any"), - # combo box item, an EAP authentication method - "MD5" => _("MD5"), - # combo box item, an EAP authentication method - "GTC" => _("GTC"), - # combo box item, an EAP authentication method - "CHAP" => _("CHAP"), - # combo box item, an EAP authentication method - "PAP" => _("PAP"), - # combo box item, an EAP authentication method - "MSCHAP" => _("MSCHAPv1"), - # combo box item, an EAP authentication method - "MSCHAPV2" => _("MSCHAPv2") - } - auth_items = { - "TTLS" => ["", "MD5", "GTC", "CHAP", "PAP", "MSCHAP", "MSCHAPV2"], - "PEAP" => ["", "MD5", "GTC", "MSCHAPV2"] - } - mode = Ops.get_string(LanItems.wl_wpa_eap, "WPA_EAP_MODE", "") - - wd = deep_copy(@wpa_eap_widget_descr) - Ops.set( - wd, - ["WPA_EAP_AUTH", "items"], - Builtins.maplist(Ops.get(auth_items, mode, [])) do |i| - [i, Ops.get(auth_names, i, "")] - end - ) - - CWM.ShowAndRun( - "widget_descr" => wd, - "contents" => contents, - # dialog caption - "caption" => _("WPA-EAP Details"), - "back_button" => Label.BackButton, - "next_button" => Label.OKButton, - "fallback_functions" => functions - ) - end - - private - - IWLIST_PKG = "wireless-tools".freeze - - def scan_supported? - # Require wireless-tools installation in order to be able to scan the - # wlan network (bsc#1112952) - return true if Stage.initial || Package.Installed(IWLIST_PKG) || Package.Install(IWLIST_PKG) - - Popup.Error( - _("The package %s was not installed. It is needed in order to " \ - "be able to scan the network") % IWLIST_PKG - ) - false - end - end -end diff --git a/src/include/network/lan/wizards.rb b/src/include/network/lan/wizards.rb index 1ee3c48ed..5eca2e1b4 100644 --- a/src/include/network/lan/wizards.rb +++ b/src/include/network/lan/wizards.rb @@ -47,7 +47,6 @@ def initialize_network_lan_wizards(include_target) Yast.include include_target, "network/lan/complex.rb" Yast.include include_target, "network/lan/dhcp.rb" Yast.include include_target, "network/lan/hardware.rb" - Yast.include include_target, "network/lan/wireless.rb" Yast.include include_target, "network/services/dns.rb" Yast.include include_target, "network/services/host.rb" end diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index d1d8d0721..b1cbc8b5e 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -59,10 +59,39 @@ class Base # Constructor def initialize @ip_aliases = [] - @bootproto = BootProtocol::STATIC + @bootproto = BootProtocol::STATIC # TODO: maybe do test query if psycical interface is attached? @startmode = Startmode.create("manual") end + # Propose reasonable defaults for given config. Useful for newly created devices. + def propose + propose_startmode + end + + def propose_startmode + Yast.import "ProductFeatures" + + product_startmode = Yast::ProductFeatures.GetStringFeature( + "network", + "startmode" + ) + + startmode = case product_startmode + when "ifplugd" + if replace_ifplugd? + hotplug_interface? ? "hotplug" : "auto" + else + product_startmode + end + when "auto" + "auto" + else + hotplug_interface? ? "hotplug" : "auto" + end + + @startmode = Startmode.create(startmode) + end + # Returns the connection type # # Any subclass could define this method is the default @@ -87,6 +116,27 @@ def virtual? def all_ips ([ip] + ip_aliases).compact end + + private + + def replace_ifplugd? + Yast.import "Arch" + + return true if !Yast::Arch.is_laptop + # virtual devices cannot expect any event from ifplugd + return true if virtual? + + false + end + + def hotplug_interface? + # virtual interface is not hotplugable + return false if virtual? + # if interface is not there + return true unless interface + + interface.hardware.hotplug + end end end end diff --git a/src/lib/y2network/connection_config/bonding.rb b/src/lib/y2network/connection_config/bonding.rb index f136f13ca..94d6575f5 100644 --- a/src/lib/y2network/connection_config/bonding.rb +++ b/src/lib/y2network/connection_config/bonding.rb @@ -33,7 +33,7 @@ class Bonding < Base def initialize super() @slaves = [] - @options = "" + @options = "mode=active-backup miimon=100" end end end diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index b51896aa8..8bf04d8bd 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -73,5 +73,26 @@ class Wireless < Base # @return [String] client private key used to encrypt for TLS attr_accessor :client_key end + + def initialize + super + self.mode = "Managed" + self.essid = "" + self.nwid = "" + self.auth_mode = :open + self.wpa_psk = "" + self.key_length = 128 + self.keys = [] + self.default_key = 0 + self.eap_mode = "PEAP" + self.eap_auth = "MSCHAPV2" + self.ap_scanmode = 1 + end + + def propose + super + # For WIFI DHCP makes more sense as majority of wifi routers act as dhcp servers + self.bootproto = BootProtocol::DHCP + end end end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index b7e7bb067..d3843975a 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -73,12 +73,11 @@ def initialize(type:, config: nil) # TODO: also config need to store it, as newly added can be later # edited with option for not yet created interface @newly_added = config.nil? - @connection_config = if config - config - else - # TODO: propose new defaults - connection_config_klass(type).new + if !config + config = connection_config_klass(type).new + config.propose end + @connection_config = config end def newly_added? diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index aaea8662f..30b89d39e 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -811,21 +811,6 @@ def Summary(mode) end end - # Add a new device - # @return true if success - def Add - return false if LanItems.Select("") != true - NetworkInterfaces.Add - true - end - - # Delete current device (see LanItems::current) - # @return true if success - def Delete - LanItems.DeleteItem - true - end - # Uses product info and is subject to installed packages. # @return Should NM be enabled? def UseNetworkManager diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index f0f659ee0..8447a53c8 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1491,162 +1491,6 @@ def SelectHWMap(hardware) #------------------- # PRIVATE FUNCTIONS - # Distributes an ifcfg hash to individual attributes. - # @param devmap [Hash] an ifcfg, values are strings - # @param defaults [Hash] should provide defaults for devmap - # @return [Hash] devmap with used values - def SetDeviceVars(devmap, defaults) - d = defaults.merge(devmap) - # address options - @bootproto = d["BOOTPROTO"] - @ipaddr = d["IPADDR"] - @prefix = d["PREFIXLEN"] - @netmask = d["NETMASK"] - @firewall_zone = d["ZONE"] - @set_default_route = case d["DHCLIENT_SET_DEFAULT_ROUTE"] - when "yes" then true - when "no" then false - # all other values! count as unspecified which is default value - end - - @startmode = d["STARTMODE"] - @description = d["NAME"] - @bond_option = d["BONDING_MODULE_OPTS"] - @vlan_etherdevice = d["ETHERDEVICE"] - - @bridge_ports = d["BRIDGE_PORTS"] - - @bond_slaves = [] - Builtins.foreach(devmap) do |key, value| - if Builtins.regexpmatch(Convert.to_string(key), "BONDING_SLAVE[0-9]+") - if !Convert.to_string(value).nil? - @bond_slaves = Builtins.add(@bond_slaves, Convert.to_string(value)) - end - end - end - d["BOND_SLAVES"] = @bond_slaves - - # tun/tap settings - @tunnel_set_owner = d["TUNNEL_SET_OWNER"] - @tunnel_set_group = d["TUNNEL_SET_GROUP"] - - # wireless options - @wl_mode = d["WIRELESS_MODE"] - @wl_essid = d["WIRELESS_ESSID"] - @wl_nwid = d["WIRELESS_NWID"] - @wl_auth_mode = d["WIRELESS_AUTH_MODE"] - @wl_wpa_psk = d["WIRELESS_WPA_PSK"] - @wl_key_length = d["WIRELESS_KEY_LENGTH"] - @wl_key = [ - d["WIRELESS_KEY_0"], - d["WIRELESS_KEY_1"], - d["WIRELESS_KEY_2"], - d["WIRELESS_KEY_3"] - ] - @wl_key[0] = d["WIRELESS_KEY"] if (@wl_key[0] || "").empty? - - @wl_default_key = d["WIRELESS_DEFAULT_KEY"].to_i - @wl_nick = d["WIRELESS_NICK"] - @wl_wpa_eap = { - "WPA_EAP_MODE" => d["WIRELESS_EAP_MODE"], - "WPA_EAP_IDENTITY" => d["WIRELESS_WPA_IDENTITY"], - "WPA_EAP_PASSWORD" => d["WIRELESS_WPA_PASSWORD"], - "WPA_EAP_ANONID" => d["WIRELESS_WPA_ANONID"], - "WPA_EAP_CLIENT_CERT" => d["WIRELESS_CLIENT_CERT"], - "WPA_EAP_CLIENT_KEY" => d["WIRELESS_CLIENT_KEY"], - "WPA_EAP_CLIENT_KEY_PASSWORD" => d["WIRELESS_CLIENT_KEY_PASSWORD"], - "WPA_EAP_CA_CERT" => d["WIRELESS_CA_CERT"], - "WPA_EAP_AUTH" => d["WIRELESS_EAP_AUTH"], - "WPA_EAP_PEAP_VERSION" => d["WIRELESS_PEAP_VERSION"] - } - @wl_channel = d["WIRELESS_CHANNEL"] - @wl_frequency = d["WIRELESS_FREQUENCY"] - @wl_bitrate = d["WIRELESS_BITRATE"] - @wl_accesspoint = d["WIRELESS_AP"] - @wl_power = d["WIRELESS_POWER"] == "yes" - @wl_ap_scanmode = d["WIRELESS_AP_SCANMODE"] - - @aliases = Ops.get_map(devmap, "_aliases", {}) - - d - end - - # Initializes s390 specific device variables. - # - # @param [Hash] devmap map with s390 specific attributes and its values - # @param [Hash] defaults map with default values for attributes not found in devmap - # @return [Hash] devmap with used values - def SetS390Vars(devmap, defaults) - return if !Arch.s390 - d = defaults.merge(devmap) - - @qeth_portname = d["QETH_PORTNAME"] - @qeth_portnumber = d["QETH_PORTNUMBER"] - @qeth_layer2 = d["QETH_LAYER2"] == "yes" - @qeth_chanids = d["QETH_CHANIDS"] - - # s/390 options - # We always have to set the MAC Address for qeth Layer2 support. - # It is used mainly as a hint for user that MAC is expected in case - # of Layer2 devices. Other devices do not need it. Simply - # because such devices do not emulate Layer2 - @qeth_macaddress = d["LLADDR"] if @qeth_layer2 - - # qeth attribute. FIXME: currently not read from system. - @ipa_takeover = defaults["IPA_TAKEOVER"] == "yes" - - # not device attribute - @qeth_options = defaults["QETH_OPTIONS"] || "" - - # handle non qeth devices - @iucv_user = defaults["IUCV_USER"] || "" - @chan_mode = defaults["CHAN_MODE"] || "" - - d - end - - def InitS390VarsByDefaults - SetS390Vars({}, @s390_defaults) - end - - # Select the given device - # FIXME: currently *dev* is always "" - # @param [String] dev device to select ("" for new device, default values) - # @return true if success - def Select(dev) - Builtins.y2debug("dev=%1", dev) - - # FIXME: should be removed, it is genereated by builder - devmap = {} - - # FIXME: encapsulate into LanItems.GetItemType ? - @type = Ops.get_string(@Items, [@current, "hwinfo", "type"], "eth") - @device = new_type_device(@type) - - # TODO: instead of udev use hwinfo dev_name - NetworkInterfaces.Name = GetItemUdev("NAME") - if Ops.less_than(Builtins.size(@Items), @current) - Ops.set(@Items, @current, "ifcfg" => NetworkInterfaces.Name) - else - Ops.set(@Items, [@current, "ifcfg"], NetworkInterfaces.Name) - end - - # general stuff - @description = BuildDescription(@type, @device, devmap, @Hardware) - - SetDeviceVars(devmap, @SysconfigDefaults) - InitS390VarsByDefaults() - - @hotplug = "" - Builtins.y2debug("type=%1", @type) - if Builtins.issubstring(@type, "-") - @type = Builtins.regexpsub(@type, "([^-]+)-.*$", "\\1") - end - Builtins.y2debug("type=%1", @type) - - true - end - # Commit pending operation # # It commits *only* content of the corresponding ifcfg into NetworkInterfaces. diff --git a/test/lan_items_read_test.rb b/test/lan_items_read_test.rb deleted file mode 100755 index 77b1735bf..000000000 --- a/test/lan_items_read_test.rb +++ /dev/null @@ -1,105 +0,0 @@ -#!/usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -require "yast" -Yast.import "LanItems" - -describe "LanItemsClass" do - subject { Yast::LanItems } - - describe "#SetDeviceVars" do - let(:defaults) do - { - "WIRELESS_KEY" => "", - "WIRELESS_KEY_0" => "", - "WIRELESS_KEY_1" => "", - "WIRELESS_KEY_2" => "", - "WIRELESS_KEY_3" => "" - } - end - - it "reads value from sysconfig data" do - subject.SetDeviceVars({ "BOOTPROTO" => "dhcp8" }, "BOOTPROTO" => "dhcp7") - expect(subject.bootproto).to eq "dhcp8" - end - - it "reads value from default data" do - subject.SetDeviceVars({}, "BOOTPROTO" => "dhcp7") - expect(subject.bootproto).to eq "dhcp7" - end - - it "reads nil if neither hash specifies the data" do - subject.SetDeviceVars({}, {}) - expect(subject.bootproto).to eq nil - end - - it "converts set_default_route" do - subject.SetDeviceVars({ "DHCLIENT_SET_DEFAULT_ROUTE" => "yes" }, defaults) - expect(subject.set_default_route).to eq true - - subject.SetDeviceVars({ "DHCLIENT_SET_DEFAULT_ROUTE" => "no" }, defaults) - expect(subject.set_default_route).to eq false - - subject.SetDeviceVars({}, defaults) - expect(subject.set_default_route).to eq nil - - subject.SetDeviceVars({ "DHCLIENT_SET_DEFAULT_ROUTE" => "unrecognized" }, defaults) - expect(subject.set_default_route).to eq nil - end - - it "converts wl_power" do - subject.SetDeviceVars({ "WIRELESS_POWER" => "yes" }, defaults) - expect(subject.wl_power).to eq true - end - - it "makes wl_key a 4-tuple when 1 key is specified" do - subject.SetDeviceVars({ "WIRELESS_KEY" => "k0" }, defaults) - expect(subject.wl_key).to eq ["k0", "", "", ""] - end - - it "makes wl_key a 4-tuple when 2 keys are specified" do - subject.SetDeviceVars({ "WIRELESS_KEY_0" => "k00", "WIRELESS_KEY_1" => "k01" }, defaults) - expect(subject.wl_key).to eq ["k00", "k01", "", ""] - end - - it "makes wl_wpa_eap a hash, with renamed kes" do - subject.SetDeviceVars({ - "WIRELESS_EAP_MODE" => "foo", - "WIRELESS_PEAP_VERSION" => "bar" - }, {}) - expect(subject.wl_wpa_eap["WPA_EAP_MODE"]).to eq "foo" - expect(subject.wl_wpa_eap["WPA_EAP_PEAP_VERSION"]).to eq "bar" - end - end - - describe "#SetS390Vars" do - let(:defaults) { {} } - - it "converts qeth_layer2" do - expect(Yast::Arch).to receive(:s390).and_return true - - subject.SetS390Vars({ "QETH_LAYER2" => "yes" }, defaults) - expect(subject.qeth_layer2).to eq true - end - end -end diff --git a/test/wireless_test.rb b/test/wireless_test.rb deleted file mode 100755 index e33271dea..000000000 --- a/test/wireless_test.rb +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -require "yast" - -Yast.import "LanItems" - -class WirelessTestClass < Yast::Module - def initialize - Yast.include self, "network/lan/wireless.rb" - end -end - -describe "WirelessInclude" do - subject { WirelessTestClass.new } - - describe "#InitPeapVersion" do - before do - allow(Yast::UI).to receive(:ChangeWidget) - end - - it "Enables widget if WPA_EAP_MODE is PEAP" do - Yast::LanItems.wl_wpa_eap["WPA_EAP_MODE"] = "PEAP" - expect(Yast::UI).to receive(:ChangeWidget).with(Id("test"), :Enabled, true) - - subject.InitPeapVersion("test") - end - end -end diff --git a/test/yaml_defaults_test.rb b/test/yaml_defaults_test.rb deleted file mode 100755 index 271e151b3..000000000 --- a/test/yaml_defaults_test.rb +++ /dev/null @@ -1,81 +0,0 @@ -#! /usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -require "yast" - -Yast.import "LanItems" - -describe "LanItems#InitS390VarsByDefaults" do - Yast.import "Arch" - - subject(:lan_items) { Yast::LanItems } - - it "sets defaults for s390 as expected" do - allow(Yast::Arch) - .to receive(:s390) - .and_return(true) - - # we need to be sure that LanItems' initialization is done *now* - # to accept arch mocking which is needed for loading reasonable - # defaults - lan_items.main - lan_items.InitS390VarsByDefaults - - expect(lan_items.chan_mode).to eql "0" - expect(lan_items.qeth_layer2).to be false - expect(lan_items.qeth_macaddress).to eql "00:00:00:00:00:00" - expect(lan_items.ipa_takeover).to be false - end -end - -describe "LanItems#SetDeviceVars" do - subject(:lan_items) { Yast::LanItems } - - it "sets generic defaults as expected" do - lan_items.SetDeviceVars({}, lan_items.instance_variable_get("@SysconfigDefaults")) - - expect(lan_items.bootproto).to eql "static" - expect(lan_items.startmode).to be_empty - end -end - -describe "LanItems#request_firmware" do - subject(:lan_items) { Yast::LanItems } - - it "loads module to firmware mapping properly" do - lan_items.main - - mapping = lan_items.instance_variable_get("@request_firmware") - expect(mapping["b43"]).to eql "b43-fwcutter" - end -end - -describe "YAML data files" do - globs = Yast.y2paths.map { |p| "#{p}/data/**/*.yml" } - yml_filenames = Dir.glob(globs) - yml_filenames.each do |f| - it "parse without error: #{f}" do - expect { YAML.load_file(f) }.to_not raise_error - end - end -end From 80bdcba3a0ec273487278fbd3b17d49135f6a318 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 2 Sep 2019 17:12:52 +0200 Subject: [PATCH 272/471] changes from review --- src/lib/y2network/connection_config/base.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index b1cbc8b5e..3e2bd8575 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -59,11 +59,13 @@ class Base # Constructor def initialize @ip_aliases = [] - @bootproto = BootProtocol::STATIC # TODO: maybe do test query if psycical interface is attached? + @bootproto = BootProtocol::STATIC # TODO: maybe do test query if physical interface is attached? @startmode = Startmode.create("manual") end # Propose reasonable defaults for given config. Useful for newly created devices. + # @note difference between constructor and propose is that initialize should set defaults same as backend + # and propose can have more tricky config or different to backend defaults. def propose propose_startmode end From df4bfcf2c0114c5cd5c27ce3d32c87cb1a790259 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 2 Sep 2019 17:27:03 +0200 Subject: [PATCH 273/471] another round of review fixes --- src/lib/y2network/connection_config/base.rb | 4 ++-- src/lib/y2network/connection_config/wireless.rb | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 3e2bd8575..00b7a4e12 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -64,8 +64,8 @@ def initialize end # Propose reasonable defaults for given config. Useful for newly created devices. - # @note difference between constructor and propose is that initialize should set defaults same as backend - # and propose can have more tricky config or different to backend defaults. + # @note difference between constructor and propose is that initialize should set simple defaults + # and propose have more tricky config that depends on env, product, etc. def propose propose_startmode end diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index 8bf04d8bd..cc2b023b8 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -76,6 +76,7 @@ class Wireless < Base def initialize super + self.mode = "Managed" self.essid = "" self.nwid = "" @@ -87,10 +88,6 @@ def initialize self.eap_mode = "PEAP" self.eap_auth = "MSCHAPV2" self.ap_scanmode = 1 - end - - def propose - super # For WIFI DHCP makes more sense as majority of wifi routers act as dhcp servers self.bootproto = BootProtocol::DHCP end From cf946473eb58066e00e4b79dac7d4746fd3a839f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 17:27:10 +0100 Subject: [PATCH 274/471] Drop reference to already removed YAML files * See pr#935 for further details. --- src/modules/LanItems.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 8447a53c8..ea0408612 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -193,13 +193,6 @@ def main Yast.include self, "network/hardware.rb" - # Default values used when creating an emulated NIC for physical s390 hardware. - @s390_defaults = YAML.load_file(Directory.find_data_file("network/s390_defaults.yml")) if Arch.s390 - - # the defaults here are what sysconfig defaults to - # (as opposed to what a new interface gets, in {#Select)} - @SysconfigDefaults = YAML.load_file(Directory.find_data_file("network/sysconfig_defaults.yml")) - # this is the map of kernel modules vs. requested firmware # non-empty keys are firmware packages shipped by SUSE @request_firmware = YAML.load_file(Directory.find_data_file("network/firmwares.yml")) From 2aa2f0413df37d2a0acd66e69085afbf3138b6ec Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 2 Sep 2019 18:47:27 +0200 Subject: [PATCH 275/471] fix proposal for wireless and few minor fixes --- .../y2network/connection_config/wireless.rb | 32 +++++++++---------- src/lib/y2network/widgets/wireless.rb | 2 ++ src/lib/y2network/widgets/wireless_mode.rb | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index cc2b023b8..737186ef1 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -72,24 +72,24 @@ class Wireless < Base attr_accessor :client_cert # @return [String] client private key used to encrypt for TLS attr_accessor :client_key - end - def initialize - super + def initialize + super - self.mode = "Managed" - self.essid = "" - self.nwid = "" - self.auth_mode = :open - self.wpa_psk = "" - self.key_length = 128 - self.keys = [] - self.default_key = 0 - self.eap_mode = "PEAP" - self.eap_auth = "MSCHAPV2" - self.ap_scanmode = 1 - # For WIFI DHCP makes more sense as majority of wifi routers act as dhcp servers - self.bootproto = BootProtocol::DHCP + self.mode = "Managed" + self.essid = "" + self.nwid = "" + self.auth_mode = :open + self.wpa_psk = "" + self.key_length = 128 + self.keys = [] + self.default_key = 0 + self.eap_mode = "PEAP" + self.eap_auth = "MSCHAPV2" + self.ap_scanmode = 1 + # For WIFI DHCP makes more sense as majority of wifi routers act as dhcp servers + self.bootproto = BootProtocol::DHCP + end end end end diff --git a/src/lib/y2network/widgets/wireless.rb b/src/lib/y2network/widgets/wireless.rb index 9ce6c8534..4d9c9b122 100644 --- a/src/lib/y2network/widgets/wireless.rb +++ b/src/lib/y2network/widgets/wireless.rb @@ -94,6 +94,8 @@ def expert_settings_widget class WirelessExpertSettings < CWM::PushButton def initialize(settings) @settings = settings + + textdomain "network" end def label diff --git a/src/lib/y2network/widgets/wireless_mode.rb b/src/lib/y2network/widgets/wireless_mode.rb index 3a9d10dba..a0d78a524 100644 --- a/src/lib/y2network/widgets/wireless_mode.rb +++ b/src/lib/y2network/widgets/wireless_mode.rb @@ -49,7 +49,7 @@ def store def items [ ["ad-hoc", _("Ad-hoc")], - ["managed", _("Managed")], + ["Managed", _("Managed")], ["master", _("Master")] ] end From cd458a0bb87d0dab1514d28d028032a7958af138 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 2 Sep 2019 19:15:44 +0200 Subject: [PATCH 276/471] fix blink button to use new backend --- src/lib/y2network/widgets/blink_button.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/blink_button.rb b/src/lib/y2network/widgets/blink_button.rb index fed03af08..afd4d0350 100644 --- a/src/lib/y2network/widgets/blink_button.rb +++ b/src/lib/y2network/widgets/blink_button.rb @@ -50,7 +50,7 @@ def contents end def handle - device = @settings["IFCFG"] + device = @settings.name timeout = Yast::UI.QueryWidget(:blink_time, :Value) log.info "blink, blink ... #{timeout} seconds on #{device} device" cmd = "/usr/sbin/ethtool -p #{device.shellescape} #{timeout.to_i}" From 567f3694fce2c77fc6ffe057fb068d3b232492d1 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 2 Sep 2019 19:15:55 +0200 Subject: [PATCH 277/471] add ethtool options to new backend --- src/lib/y2network/connection_config/base.rb | 6 ++++- src/lib/y2network/interface_config_builder.rb | 27 +++++-------------- .../connection_config_readers/base.rb | 1 + .../connection_config_writers/base.rb | 1 + src/lib/y2network/sysconfig/interface_file.rb | 4 +++ 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 00b7a4e12..8aa82df4b 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -49,18 +49,22 @@ class Base attr_accessor :ip_aliases # @return [Integer, nil] attr_accessor :mtu - # @return [Startmode, nil] + # @return [Startmode] attr_accessor :startmode # @return [String] Connection's description (e.g., "Ethernet Card 0") attr_accessor :description # @return [String] Link layer address attr_accessor :lladdress + # @return [String] configuration for ethtools when initializing + attr_accessor :ethtool_options # Constructor def initialize @ip_aliases = [] @bootproto = BootProtocol::STATIC # TODO: maybe do test query if physical interface is attached? @startmode = Startmode.create("manual") + @description = "" + @ethtool_options = "" end # Propose reasonable defaults for given config. Useful for newly created devices. diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index c93bbc298..52d669731 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -17,6 +17,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. require "yast" +require "forwardable" require "y2network/connection_config" require "y2network/hwinfo" @@ -36,6 +37,7 @@ module Y2Network # {Yast::LanItemsClass#Commit Yast::LanItems.Commit(builder)} use it. class InterfaceConfigBuilder include Yast::Logger + extend Forwardable # Load fresh instance of interface config builder for given type. # It can be specialized type or generic, depending if specialized is needed. @@ -56,7 +58,7 @@ def self.for(type, config: nil) # @return [String] Device name (eth0, wlan0, etc.) attr_reader :name # @return [Y2Network::InterfaceType] type of @see Y2Network::Interface which is intended to be build - attr_accessor :type + attr_reader :type # @return [Y2Network::ConnectionConfig] connection config on which builder operates attr_reader :connection_config # @return [Symbol] Mechanism to rename the interface (:none -no hardware based-, :mac or :bus_id) @@ -64,6 +66,9 @@ def self.for(type, config: nil) # @return [Y2Network::Interface,nil] Underlying interface if it exists attr_reader :interface + def_delegators :@connection_config, + :startmode, :ethtool_options, :ethtool_options= + # Constructor # # Load with reasonable defaults @@ -192,9 +197,7 @@ def firewall_zone end # sets assigned firewall zone - def firewall_zone=(value) - @firewall_zone = value - end + attr_writer :firewall_zone # @return [Y2Network::BootProtocol] def boot_protocol @@ -207,11 +210,6 @@ def boot_protocol=(value) @connection_config.bootproto = Y2Network::BootProtocol.from_name(value) end - # @return [Startmode] - def startmode - @connection_config.startmode - end - # @param [String,Y2Network::Startmode] name startmode name used to create Startmode object # or object itself def startmode=(name) @@ -285,17 +283,6 @@ def aliases=(value) @aliases = value end - # TODO: eth only? - # @return [String] - def ethtool_options - @config["ETHTOOL_OPTIONS"] - end - - # @param [String] value - def ethtool_options=(value) - @config["ETHTOOL_OPTIONS"] = value - end - # @return [String] def ip_address default = @connection_config.ip diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 5f96f80e7..e28232912 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -54,6 +54,7 @@ def connection_config conn.lladdress = file.lladdr conn.startmode = Startmode.create(file.startmode || "manual") conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" + conn.ethtool_options = file.ethtool_options update_connection_config(conn) end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index e6082198a..a6182f9e8 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -45,6 +45,7 @@ def write(conn) file.lladdr = conn.lladdress file.startmode = conn.startmode.to_s file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" + file.ethtool_options = conn.ethtool_options unless conn.ethtool_options.empty? add_ips(conn) update_file(conn) end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 68ba95240..b59c336be 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -181,6 +181,10 @@ def variable_name(param_name) # @return [String] Link layer address define_variable(:lladdr) + # !@attribute [r] ethtool_options + # @return [String] setting variables on device activation. See man ethtool + define_variable(:ethtool_options) + # !@attribute [r] wireless_key_length # @return [Integer] Length in bits for all keys used define_variable(:wireless_key_length, :integer) From 70d488edcce38fa6c08963dfefb9942e0bc89c43 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 2 Sep 2019 19:30:03 +0200 Subject: [PATCH 278/471] fix tests --- test/y2network/sysconfig/interfaces_writer_test.rb | 3 +++ test/y2network/widgets/blink_button_test.rb | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index dfd2fa1f1..4481a2ebf 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -42,6 +42,9 @@ allow(Yast::Execute).to receive(:on_target) allow(eth0).to receive(:hardware).and_return(hardware) allow(writer).to receive(:sleep) + + # prevent collision with real hardware + allow(Y2Network::UdevRule).to receive(:all).and_return([]) end around do |example| diff --git a/test/y2network/widgets/blink_button_test.rb b/test/y2network/widgets/blink_button_test.rb index e0f2010d6..4d88be9b5 100644 --- a/test/y2network/widgets/blink_button_test.rb +++ b/test/y2network/widgets/blink_button_test.rb @@ -21,10 +21,14 @@ require "cwm/rspec" require "y2network/widgets/blink_button" +require "y2network/interface_config_builder" describe Y2Network::Widgets::BlinkButton do - subject { described_class.new("IFCFG" => "eth0") } + let(:builder) { Y2Network::InterfaceConfigBuilder.for("eth") } + subject { described_class.new(builder) } + before do + builder.name = "eth0" # no real blinking allow(Yast::SCR).to receive(:Execute) end From c4a358074004d94155b594ac9aef7d21abcf97e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 14:45:24 +0100 Subject: [PATCH 279/471] Drop FakeInterface class --- src/lib/y2network/fake_interface.rb | 38 ------------------ test/y2network/fake_interface_test.rb | 40 ------------------- .../connection_config_writers/vlan_test.rb | 1 - 3 files changed, 79 deletions(-) delete mode 100644 src/lib/y2network/fake_interface.rb delete mode 100644 test/y2network/fake_interface_test.rb diff --git a/src/lib/y2network/fake_interface.rb b/src/lib/y2network/fake_interface.rb deleted file mode 100644 index db1a914a1..000000000 --- a/src/lib/y2network/fake_interface.rb +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require "y2network/interface" - -module Y2Network - # A physical interface that is not plugged in. - class FakeInterface < Interface - class << self - # Build connection - # - # @todo Would be possible to get the name from the connection? - # - # @param name [String] Interface name - # @param conn [ConnectionConfig] Connection configuration related to the - # network interface - def from_connection(name, conn) - new(name, type: conn.type) - end - end - end -end diff --git a/test/y2network/fake_interface_test.rb b/test/y2network/fake_interface_test.rb deleted file mode 100644 index 52fe98fdc..000000000 --- a/test/y2network/fake_interface_test.rb +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. -require_relative "../test_helper" -require "y2network/fake_interface" -require "y2network/connection_config/wireless" - -describe Y2Network::FakeInterface do - subject(:interface) { described_class.new("eth0", type: iface_type) } - - let(:iface_type) { Y2Network::InterfaceType::ETHERNET } - - describe ".from_connection" do - let(:conn) do - Y2Network::ConnectionConfig::Wireless.new.tap do |conn| - conn.interface = "wlan0" - end - end - - it "returns a fake interface using the connection's type" do - iface = described_class.from_connection("wlan0", conn) - expect(iface.type).to eq(Y2Network::InterfaceType::WIRELESS) - end - end -end diff --git a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb index 4d46231fd..9010cf163 100644 --- a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/vlan_test.rb @@ -20,7 +20,6 @@ require_relative "../../../test_helper" require "y2network/sysconfig/connection_config_writers/vlan" -require "y2network/fake_interface" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/vlan" From 2b5284d2a021448ae0547e8a7ed5a06005522226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 15:24:47 +0100 Subject: [PATCH 280/471] Cache hardware information --- src/lib/y2network/hwinfo.rb | 48 ++++++++++++++++++++++++++++------- test/y2network/hwinfo_test.rb | 3 ++- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index 7f2f0f54b..dced06d4d 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -25,6 +25,28 @@ class HardwareWrapper def initialize Yast.include self, "network/routines.rb" end + + # Returns the network devices hardware information + # + # @return [Array] + def netcards + return @netcards if @netcards + @netcards = ReadHardware("netcard").map do |attrs| + add_missing_attrs(attrs) + Hwinfo.new(attrs) + end + end + + private + + def add_missing_attrs(hash) + name = hash["dev_name"] + return unless name + raw_dev_port = Yast::SCR.Read( + Yast::Path.new(".target.string"), "/sys/class_net/#{name}/dev_port" + ).to_s.strip + hash["dev_port"] = raw_dev_port unless raw_dev_port.empty? + end end # Stores useful (from networking POV) items of hwinfo for an interface @@ -50,6 +72,13 @@ def for(name) hwinfo_from_hardware(name) || hwinfo_from_udev(name) || Hwinfo.new end + # Resets the hardware information + # + # It will be re-read the next time is needed. + def reset + @hardware_wrapper = nil + end + private # Returns hardware information for the given device @@ -59,15 +88,16 @@ def for(name) # @param name [String] Interface's name # @return [Hwinfo,nil] Hardware info or nil if not found def hwinfo_from_hardware(name) - netcards = HardwareWrapper.new.ReadHardware("netcard") - hw = netcards.find { |h| h["dev_name"] == name } - return nil if hw.nil? - - raw_dev_port = Yast::SCR.Read( - Yast::Path.new(".target.string"), "/sys/class_net/#{name}/dev_port" - ).to_s.strip - hw["dev_port"] = raw_dev_port unless raw_dev_port.empty? - new(hw) + hardware_wrapper.netcards.find { |h| h.dev_name == name } + end + + # Hardware wrapper instance + # + # It memoizes the hardware wrapper in order to speed up the access + # + # @return [HardWrapper] + def hardware_wrapper + @hardware_wrapper = HardwareWrapper.new end # Returns hardware information for the given device diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index cc1fcf930..031cb263e 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -28,12 +28,13 @@ end let(:interface_name) { "enp1s0" } - let(:hw_wrapper) { double("Y2Network::HardwareWrapper", ReadHardware: hardware) } + let(:hw_wrapper) { Y2Network::HardwareWrapper.new } before do allow(Y2Network::Hwinfo).to receive(:hwinfo_from_hardware).and_call_original allow(Y2Network::HardwareWrapper).to receive(:new).and_return(hw_wrapper) allow(Y2Network::UdevRule).to receive(:find_for).with(interface_name).and_return(udev_rule) + allow(hw_wrapper).to receive(:ReadHardware).and_return(hardware) end let(:udev_rule) { nil } From 68f45e98fdc7b3186370a2f880e2136afc824358 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 3 Sep 2019 09:33:15 +0200 Subject: [PATCH 281/471] remove old firewall zone value --- src/lib/y2network/interface_config_builder.rb | 2 -- src/modules/LanItems.rb | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 52d669731..acbb80fc7 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -121,8 +121,6 @@ def save # create new instance as name can change firewall_interface = Y2Firewall::Firewalld::Interface.new(name) if Y2Firewall::Firewalld.instance.installed? - # TODO: New backend? - Yast::LanItems.firewall_zone = firewall_zone # TODO: should change only if different, but maybe firewall_interface responsibility? firewall_interface.zone = firewall_zone if !firewall_interface.zone || firewall_zone != firewall_interface.zone.name end diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index ea0408612..7e60e9940 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -49,8 +49,6 @@ module Yast # FIXME: well this class really is not nice class LanItemsClass < Module - attr_accessor :firewall_zone - include Logger include Wicked @@ -121,7 +119,6 @@ def main @wl_key = [] @wl_default_key = 0 @wl_nick = "" - @firewall_zone = nil # FIXME: We should unify bridge_ports and bond_slaves variables From 50a5fb8ca9fbf8dc5457ff40aca180e921d0fecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 15:46:59 +0100 Subject: [PATCH 282/471] Add a Hwinfo#present? method --- src/lib/y2network/hwinfo.rb | 16 +++++++++++++++- test/y2network/hwinfo_test.rb | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index dced06d4d..3b7bb6891 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -19,6 +19,7 @@ require "yast" require "y2network/driver" +require "y2network/udev_rule" module Y2Network class HardwareWrapper @@ -171,7 +172,9 @@ def initialize(hwinfo = {}) { name: "wl_enc_modes", default: nil }, { name: "wl_channels", default: nil }, { name: "wl_bitrates", default: nil }, - { name: "dev_port", default: nil } + { name: "dev_port", default: nil }, + { name: "type", default: nil }, + { name: "name", default: "" } ].each do |hwinfo_item| define_method hwinfo_item[:name].downcase do @hwinfo ? @hwinfo.fetch(hwinfo_item[:name], hwinfo_item[:default]) : hwinfo_item[:default] @@ -214,6 +217,17 @@ def drivers modules.map { |m| Driver.new(*m) } end + # Determines whether the hardware is available (plugged) + # + # If the hardware layer was able to get its type, it consider the hardware to be connected. Bear + # in mind that it is not possible to just rely in #exists? because it could include some info + # from udev rules. + # + # @return [Boolean] + def present? + !!type + end + # Determines whether two objects are equivalent # # Ignores any element having a nil value. diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 031cb263e..7c348bdd6 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -149,4 +149,22 @@ .to eq(described_class.new("dev_name" => "eth0")) end end + + describe "#present?" do + context "when the hardware was detected" do + subject(:hwinfo) { described_class.new("type" => "eth") } + + it "returns true" do + expect(hwinfo).to be_present + end + end + + context "when the hardware was not detected" do + subject(:hwinfo) { described_class.new({}) } + + it "returns false" do + expect(hwinfo).to_not be_present + end + end + end end From e6dbabaf4d7628c8482854ff4b8cdd3f25e8d734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 2 Sep 2019 16:31:05 +0100 Subject: [PATCH 283/471] Replace FakeInterface with PhysicalInterface --- src/lib/y2network/interface.rb | 3 +-- src/lib/y2network/physical_interface.rb | 22 +++++++++++++++++++ .../y2network/sysconfig/interfaces_reader.rb | 10 ++++++--- .../sysconfig/interfaces_reader_test.rb | 5 +++-- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 282d8379b..4a2df177b 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -78,9 +78,8 @@ def initialize(name, type: InterfaceType::ETHERNET) @name = name @description = "" @type = type + # TODO: move renaming logic to physical interfaces only @renaming_mechanism = :none - # @hardware and @name should not change during life of the object - @hardware = Hwinfo.for(name) init(name) end diff --git a/src/lib/y2network/physical_interface.rb b/src/lib/y2network/physical_interface.rb index b8cf9c90b..5c7c3cf3b 100644 --- a/src/lib/y2network/physical_interface.rb +++ b/src/lib/y2network/physical_interface.rb @@ -18,11 +18,33 @@ # find current contact information at www.suse.com. require "y2network/interface" +require "y2network/hwinfo" module Y2Network # Physical interface class (ethernet, wireless, infiniband...) class PhysicalInterface < Interface # @return [String] attr_accessor :ethtool_options + + # Constructor + # + # @param name [String] Interface name (e.g., "eth0") + # @param type [InterfaceType] Interface type + # @param hardware [Hwinfo] Hardware information + def initialize(name, type: InterfaceType::ETHERNET, hardware: nil) + super(name, type: type) + # @hardware and @name should not change during life of the object + @hardware = hardware || Hwinfo.for(name) + end + + # Determines whether the interface is present (attached) + # + # It relies in the hardware information + # + # @return [Boolean] + # @see Interface#present? + def present? + @hardware.present? + end end end diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 9a220a679..38634799e 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -22,7 +22,6 @@ require "y2network/interface_type" require "y2network/virtual_interface" require "y2network/physical_interface" -require "y2network/fake_interface" require "y2network/sysconfig/connection_config_reader" require "y2network/interfaces_collection" require "y2network/connection_configs_collection" @@ -144,8 +143,13 @@ def configured_devices # @param conn [ConnectionConfig] Connection configuration related to the # network interface def add_interface(name, conn) - interface_class = conn.virtual? ? VirtualInterface : FakeInterface - @interfaces << interface_class.from_connection(name, conn) + interface = + if conn.virtual? + VirtualInterface.from_connection(name, conn) + else + PhysicalInterface.new(conn.name, hardware: Hwinfo.for(conn.name)) + end + @interfaces << interface end # Detects the renaming mechanism used by the interface diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index 8524c9a21..44442f967 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -85,9 +85,10 @@ end context "and it is not a virtual connection" do - it "creates a fake interface" do + it "creates a not present physical interface" do eth1 = reader.interfaces.by_name("eth1") - expect(eth1).to be_a Y2Network::FakeInterface + expect(eth1).to be_a Y2Network::PhysicalInterface + expect(eth1).to_not be_present end end end From 0fa47dd2b2bf517cee3f59f9ba8543bb3a833d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 08:37:36 +0100 Subject: [PATCH 284/471] Add a #netcards array to return Hwinfo objects instead of a hash --- src/lib/y2network/hwinfo.rb | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index 3b7bb6891..ab6eb0b49 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -21,6 +21,8 @@ require "y2network/driver" require "y2network/udev_rule" +Yast.import "LanItems" + module Y2Network class HardwareWrapper def initialize @@ -29,24 +31,35 @@ def initialize # Returns the network devices hardware information # - # @return [Array] + # @return [Array] Hardware information for netword devices def netcards return @netcards if @netcards + read_hardware @netcards = ReadHardware("netcard").map do |attrs| - add_missing_attrs(attrs) - Hwinfo.new(attrs) + name = attrs["dev_name"] + extra_attrs = name ? extra_attrs_for(name) : {} + Hwinfo.new(attrs.merge(extra_attrs)) end end private - def add_missing_attrs(hash) - name = hash["dev_name"] - return unless name + # Add aditional attributes + # + # @param name [String] Device name + # @return [Hash] Hash containing extra attributes + def extra_attrs_for(name) + extra = {} raw_dev_port = Yast::SCR.Read( Yast::Path.new(".target.string"), "/sys/class_net/#{name}/dev_port" ).to_s.strip - hash["dev_port"] = raw_dev_port unless raw_dev_port.empty? + extra["dev_port"] = raw_dev_port unless raw_dev_port.empty? + extra + end + + # Makes sure that the hardware information was read + def read_hardware + Yast::LanItems.ReadHw if Yast::LanItems.Hardware.empty? end end @@ -73,6 +86,13 @@ def for(name) hwinfo_from_hardware(name) || hwinfo_from_udev(name) || Hwinfo.new end + # Returns the network devices hardware information + # + # @return [Array] Hardware information for netword devices + def netcards + hardware_wrapper.netcards + end + # Resets the hardware information # # It will be re-read the next time is needed. From 7f35e1a124ef4708c958b16371a6a3431c811e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 08:38:47 +0100 Subject: [PATCH 285/471] Interface class receives the hardware information in the controller * It fixes reading of unnamed interfaces (like s390 ones) --- src/lib/y2network/physical_interface.rb | 3 ++- .../y2network/sysconfig/interfaces_reader.rb | 26 +++---------------- test/y2network/autoinst/config_reader_test.rb | 2 -- .../sysconfig/interfaces_reader_test.rb | 7 +++-- 4 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/lib/y2network/physical_interface.rb b/src/lib/y2network/physical_interface.rb index 5c7c3cf3b..6bf4daa15 100644 --- a/src/lib/y2network/physical_interface.rb +++ b/src/lib/y2network/physical_interface.rb @@ -34,7 +34,8 @@ class PhysicalInterface < Interface def initialize(name, type: InterfaceType::ETHERNET, hardware: nil) super(name, type: type) # @hardware and @name should not change during life of the object - @hardware = hardware || Hwinfo.for(name) + @hardware = hardware || Hwinfo.for(name) || Hwinfo.new + @description = @hardware.name end # Determines whether the interface is present (attached) diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 38634799e..99eba0ca0 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -28,8 +28,6 @@ require "y2network/sysconfig/type_detector" require "y2network/udev_rule" -Yast.import "LanItems" - module Y2Network module Sysconfig # This class reads interfaces configuration from sysconfig files @@ -70,29 +68,14 @@ def interfaces private # Finds the physical interfaces - # - # Physical interfaces are read from the old LanItems module def find_physical_interfaces return if @interfaces - physical_interfaces = hardware.map do |h| + physical_interfaces = Hwinfo.netcards.map do |h| build_physical_interface(h) end @interfaces = Y2Network::InterfacesCollection.new(physical_interfaces) end - # Returns hardware information - # - # This method makes sure that the hardware information was read. - # - # @todo It still relies on Yast::LanItems.Hardware - # - # @return [Array] Hardware information - def hardware - Yast::LanItems.Hardware unless Yast::LanItems.Hardware.empty? - Yast::LanItems.ReadHw # try again if no hardware was found - Yast::LanItems.Hardware - end - # Finds the connections configurations def find_connections @connections ||= @@ -114,11 +97,10 @@ def find_connections # @option data [String] "dev_name" Device name ("eth0") # @option data [String] "name" Device description # @option data [String] "type" Device type ("eth", "wlan", etc.) - def build_physical_interface(data) - Y2Network::PhysicalInterface.new(data["dev_name"]).tap do |iface| - iface.description = data["name"] + def build_physical_interface(hwinfo) + Y2Network::PhysicalInterface.new(hwinfo.dev_name, hardware: hwinfo).tap do |iface| iface.renaming_mechanism = renaming_mechanism_for(iface.name) - iface.type = InterfaceType.from_short_name(data["type"]) || TypeDetector.type_of(iface.name) + iface.type = InterfaceType.from_short_name(hwinfo.type) || TypeDetector.type_of(iface.name) end end diff --git a/test/y2network/autoinst/config_reader_test.rb b/test/y2network/autoinst/config_reader_test.rb index 8b5843937..31ee9a38b 100644 --- a/test/y2network/autoinst/config_reader_test.rb +++ b/test/y2network/autoinst/config_reader_test.rb @@ -62,8 +62,6 @@ describe "#config" do it "builds a new Y2Network::Config from a Y2Networking::Section" do - # TODO: mock hardware properly - allow_any_instance_of(Y2Network::Sysconfig::InterfacesReader).to receive(:hardware).and_return([]) expect(subject.config).to be_a Y2Network::Config expect(subject.config.routing).to be_a Y2Network::Routing expect(subject.config.dns).to be_a Y2Network::DNS diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index 44442f967..e6cf2a0f3 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -38,16 +38,19 @@ Y2Network::UdevRule.new( [ Y2Network::UdevRulePart.new("ATTR{address}", "==", "00:12:34:56:78"), - Y2Network::UdevRulePart.new("ACTION", "=", "eth0") + Y2Network::UdevRulePart.new("NAME", "=", "eth0") ] ) end let(:configured_interfaces) { ["lo", "eth0"] } + let(:hardware_wrapper) { Y2Network::HardwareWrapper.new } + TYPES = { "eth0" => "eth" }.freeze before do - allow(Yast::LanItems).to receive(:Hardware).and_return(netcards) + allow(hardware_wrapper).to receive(:ReadHardware).and_return(netcards) + allow(Y2Network::HardwareWrapper).to receive(:new).and_return(hardware_wrapper) allow(Yast::SCR).to receive(:Dir).with(Yast::Path.new(".network.section")) .and_return(configured_interfaces) allow(Yast::SCR).to receive(:Dir).and_call_original From 3bd003ec6b7cf0247577d1ab3146de0ce3896973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 09:25:52 +0100 Subject: [PATCH 286/471] Minor documentation fix --- src/lib/y2network/sysconfig/interfaces_reader.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 99eba0ca0..a3b265a6e 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -93,10 +93,7 @@ def find_connections # Instantiates an interface given a hash containing hardware details # - # @param data [Hash] hardware information - # @option data [String] "dev_name" Device name ("eth0") - # @option data [String] "name" Device description - # @option data [String] "type" Device type ("eth", "wlan", etc.) + # @param hwinfo [Hash] hardware information def build_physical_interface(hwinfo) Y2Network::PhysicalInterface.new(hwinfo.dev_name, hardware: hwinfo).tap do |iface| iface.renaming_mechanism = renaming_mechanism_for(iface.name) From f03bb368cfe0e063e4d1a00c1af5004fb217eefc Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 3 Sep 2019 11:03:34 +0200 Subject: [PATCH 287/471] add zone to ifcfg file --- src/lib/y2network/connection_config/base.rb | 3 +++ src/lib/y2network/interface_config_builder.rb | 4 +++- src/lib/y2network/sysconfig/connection_config_readers/base.rb | 1 + src/lib/y2network/sysconfig/connection_config_writers/base.rb | 1 + src/lib/y2network/sysconfig/interface_file.rb | 4 ++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 8aa82df4b..a75516664 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -57,6 +57,8 @@ class Base attr_accessor :lladdress # @return [String] configuration for ethtools when initializing attr_accessor :ethtool_options + # @return [String] assigned firewall zone to interface + attr_accessor :firewall_zone # Constructor def initialize @@ -65,6 +67,7 @@ def initialize @startmode = Startmode.create("manual") @description = "" @ethtool_options = "" + @firewall_zone = "" end # Propose reasonable defaults for given config. Useful for newly created devices. diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index acbb80fc7..9295c3d49 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -118,6 +118,8 @@ def save yast_config.connections.add_or_update(@connection_config) yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? + # write to ifcfg always and to firewalld only when available + @connection_config.firewall_zone = firewall_zone # create new instance as name can change firewall_interface = Y2Firewall::Firewalld::Interface.new(name) if Y2Firewall::Firewalld.instance.installed? @@ -191,7 +193,7 @@ def firewall_zone # TODO: handle renaming firewall_interface = Y2Firewall::Firewalld::Interface.new(name) - @firewall_zone = firewall_interface.zone && firewall_interface.zone.name + @firewall_zone = (firewall_interface.zone && firewall_interface.zone.name) || @connection_config.firewall_zone end # sets assigned firewall zone diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index e28232912..501193550 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -55,6 +55,7 @@ def connection_config conn.startmode = Startmode.create(file.startmode || "manual") conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" conn.ethtool_options = file.ethtool_options + conn.firewall_zone = file.zone update_connection_config(conn) end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index a6182f9e8..ef6f6410e 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -46,6 +46,7 @@ def write(conn) file.startmode = conn.startmode.to_s file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" file.ethtool_options = conn.ethtool_options unless conn.ethtool_options.empty? + file.zone = conn.firewall_zone add_ips(conn) update_file(conn) end diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index b59c336be..350c02a4e 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -185,6 +185,10 @@ def variable_name(param_name) # @return [String] setting variables on device activation. See man ethtool define_variable(:ethtool_options) + # !@attribute [r] zone + # @return [String] assign zone to interface. Extensions then can handle it + define_variable(:zone) + # !@attribute [r] wireless_key_length # @return [Integer] Length in bits for all keys used define_variable(:wireless_key_length, :integer) From 2af999095ccc1a2bdd15541c14485161142845f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 11:30:49 +0100 Subject: [PATCH 288/471] Handle virtual devices addition through the Y2Network::Config class * LanItems.add_device_to_routing is not used anymore. --- src/include/network/lan/address.rb | 4 -- src/lib/y2network/config.rb | 12 ++++ src/lib/y2network/interface_config_builder.rb | 2 +- src/lib/y2network/interfaces_collection.rb | 2 +- test/y2network/config_test.rb | 55 +++++++++++++++++++ .../interface_config_builder_test.rb | 2 +- 6 files changed, 70 insertions(+), 7 deletions(-) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index 530293469..f99de9d82 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -97,10 +97,6 @@ def AddressDialog(builder:) end end end - - # When virtual interfaces are added the list of routing devices needs - # to be updated to offer them - LanItems.add_device_to_routing if LanItems.update_routing_devices? end log.info "AddressDialog res: #{ret.inspect}" diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 500eaeb1d..0a29b81ea 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -22,6 +22,7 @@ require "y2network/dns" require "y2network/interfaces_collection" require "y2network/connection_configs_collection" +require "y2network/virtual_interface" module Y2Network # This class represents the current network configuration including interfaces, @@ -150,6 +151,17 @@ def delete_interface(name) interfaces.reject! { |i| i.name == name } end + # Adds or update a connection config + # + # If it is a virtual connection, it adds interface if it does not exist. + def add_or_update_connection_config(connection_config) + connections.add_or_update(connection_config) + return unless connection_config.virtual? + interface = interfaces.by_name(connection_config.interface) + return if interface + interfaces << VirtualInterface.from_connection(connection_config.interface, connection_config) + end + alias_method :eql?, :== end end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index c93bbc298..77f96e791 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -110,7 +110,7 @@ def save @connection_config.name = name @connection_config.interface = name - yast_config.connections.add_or_update(@connection_config) + yast_config.add_or_update_connection_config(@connection_config) yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? # create new instance as name can change diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index b15b38af6..501d429a2 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -46,7 +46,7 @@ class InterfacesCollection attr_reader :interfaces alias_method :to_a, :interfaces - def_delegators :@interfaces, :each, :push, :<<, :reject!, :map, :flat_map, :any? + def_delegators :@interfaces, :each, :push, :<<, :reject!, :map, :flat_map, :any?, :size # Constructor # diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 4f54200e2..4cb3063da 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -21,6 +21,7 @@ require "y2network/routing_table" require "y2network/interface" require "y2network/interfaces_collection" +require "y2network/connection_config/bridge" require "y2network/connection_config/ethernet" require "y2network/connection_configs_collection" require "y2network/sysconfig/config_reader" @@ -189,4 +190,58 @@ end end end + + describe "#add_or_update_connection_config" do + let(:new_conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| + conn.interface = "eth2" + end + end + + it "adds the connection config" do + config.add_or_update_connection_config(new_conn) + expect(config.connections.by_name(new_conn.name)).to eq(new_conn) + end + + context "when a connection config with the same name exists" do + let(:other_conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| + conn.interface = "eth2" + end + end + + before do + config.add_or_update_connection_config(new_conn) + end + + it "updates the connection config" do + config.add_or_update_connection_config(other_conn) + expect(config.connections.by_name(new_conn.name)).to eq(other_conn) + end + end + + context "when is a virtual connection config" do + let(:new_conn) do + Y2Network::ConnectionConfig::Bridge.new.tap do |conn| + conn.interface = "br0" + end + end + + it "adds the corresponding virtual interface" do + config.add_or_update_connection_config(new_conn) + expect(config.interfaces.by_name("br0")).to be_a(Y2Network::VirtualInterface) + end + + context "and the interface already exists" do + before do + config.interfaces << Y2Network::VirtualInterface.new("br0") + end + + it "does not add any interface" do + expect { config.add_or_update_connection_config(new_conn) } + .to_not change { config.interfaces.size } + end + end + end + end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 31b41baa3..b55b0ed99 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -79,7 +79,7 @@ end it "saves connection config" do - expect(config.connections).to receive(:add_or_update).with(Y2Network::ConnectionConfig::Base) + expect(config).to receive(:add_or_update_connection_config).with(Y2Network::ConnectionConfig::Base) subject.save end From 821b71f59ec8a27abee3e3af818fffe1bae83751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 11:57:39 +0100 Subject: [PATCH 289/471] Load all connection configs classes --- src/lib/y2network/connection_config.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lib/y2network/connection_config.rb b/src/lib/y2network/connection_config.rb index 9ef19495e..155611d2b 100644 --- a/src/lib/y2network/connection_config.rb +++ b/src/lib/y2network/connection_config.rb @@ -19,9 +19,17 @@ require "y2network/connection_config/base" require "y2network/connection_config/bonding" +require "y2network/connection_config/bridge" +require "y2network/connection_config/ctc" require "y2network/connection_config/dummy" require "y2network/connection_config/ethernet" +require "y2network/connection_config/hsi" require "y2network/connection_config/infiniband" require "y2network/connection_config/ip_config" +require "y2network/connection_config/lcs" +require "y2network/connection_config/qeth" +require "y2network/connection_config/tap" +require "y2network/connection_config/tun" +require "y2network/connection_config/usb" require "y2network/connection_config/vlan" require "y2network/connection_config/wireless" From adccf9e3ef3cae6317612e24021f58edc760a314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 12:09:17 +0100 Subject: [PATCH 290/471] Fix the interfaces list to display virtual interfaces --- src/lib/y2network/widgets/interfaces_table.rb | 15 +++++++++++---- test/y2network/widgets/interfaces_table_test.rb | 11 ++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 56314d863..29f750a23 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -51,12 +51,10 @@ def handle def items config = Yast::Lan.yast_config config.interfaces.map do |interface| - hwinfo = interface.hardware - friendly_name = hwinfo.exists? ? hwinfo.description : interface.name conn = config.connections.by_name(interface.name) [ interface.name, # first is ID in table - friendly_name, + friendly_name(interface), interface_protocol(conn), interface.name, "" @@ -88,7 +86,7 @@ def create_description interface = Yast::Lan.yast_config.interfaces.by_name(value) hwinfo = interface.hardware result = "" - if !hwinfo.exists? + if hwinfo.nil? || !hwinfo.exists? result << "(" << _("No hardware information") << ")
    " else result << "(" << _("Not connected") << ")
    " if !hwinfo.link @@ -108,6 +106,15 @@ def create_description result end + + # Returns a friendly name for a given interface + # + # @param interface [Interface] Network interface + # @return [String] Friendly name for the interface (description or name) + def friendly_name(interface) + hwinfo = interface.hardware + hwinfo && hwinfo.present? ? hwinfo.description : interface.name + end end end end diff --git a/test/y2network/widgets/interfaces_table_test.rb b/test/y2network/widgets/interfaces_table_test.rb index 227f0b61a..c516a9a1d 100644 --- a/test/y2network/widgets/interfaces_table_test.rb +++ b/test/y2network/widgets/interfaces_table_test.rb @@ -30,18 +30,23 @@ let(:description) { double(:value= => nil) } let(:eth0) { instance_double(Y2Network::Interface, name: "eth0", hardware: hwinfo) } - let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } + let(:br0) { instance_double(Y2Network::VirtualInterface, name: "br0", hardware: nil) } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, br0]) } let(:hwinfo) do - instance_double(Y2Network::Hwinfo, link: link, mac: mac, busid: busid, exists?: exists?, description: "") + instance_double(Y2Network::Hwinfo, link: link, mac: mac, busid: busid, + exists?: exists?, present?: true, description: "") end let(:mac) { "01:23:45:67:89:ab" } let(:busid) { "0000:04:00.0" } let(:link) { false } let(:exists?) { true } - let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn]) } + let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn, br0_conn]) } let(:eth0_conn) do Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } end + let(:br0_conn) do + Y2Network::ConnectionConfig::Bridge.new.tap { |c| c.name = "br0" } + end before do allow(Yast::Lan).to receive(:yast_config).and_return(double(interfaces: interfaces, connections: connections)) From 21ab275d0495acce6d1c2593a5dc2c6caecc1afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 12:09:57 +0100 Subject: [PATCH 291/471] Display the IP in the interfaces list --- src/lib/y2network/widgets/interfaces_table.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 29f750a23..b3d159861 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -76,7 +76,8 @@ def interface_protocol(connection) bootproto = connection.bootproto.name if bootproto == "static" - connection.ip.to_s + ip_config = connection.ip + ip_config ? ip_config.address.to_s : "" else bootproto.upcase end From 1bceb6ec4aeeff4eee315e234818e27b50c37cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 12:17:15 +0100 Subject: [PATCH 292/471] Virtual.from_connection receives only the connection object --- src/lib/y2network/config.rb | 2 +- .../y2network/sysconfig/interfaces_reader.rb | 7 +++---- src/lib/y2network/virtual_interface.rb | 4 ++-- test/y2network/virtual_interface_test.rb | 18 +++++++++++++++++- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 0a29b81ea..be298a97a 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -159,7 +159,7 @@ def add_or_update_connection_config(connection_config) return unless connection_config.virtual? interface = interfaces.by_name(connection_config.interface) return if interface - interfaces << VirtualInterface.from_connection(connection_config.interface, connection_config) + interfaces << VirtualInterface.from_connection(connection_config) end alias_method :eql?, :== diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index a3b265a6e..5e6d8a5a1 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -86,7 +86,7 @@ def find_connections interface ? interface.type : nil ) next unless connection - add_interface(name, connection) if interface.nil? + add_interface(connection) if interface.nil? conns << connection end end @@ -118,13 +118,12 @@ def configured_devices # while reading the configuration. In such situations, a fake one # should be added. # - # @param name [String] Interface name # @param conn [ConnectionConfig] Connection configuration related to the # network interface - def add_interface(name, conn) + def add_interface(conn) interface = if conn.virtual? - VirtualInterface.from_connection(name, conn) + VirtualInterface.from_connection(conn) else PhysicalInterface.new(conn.name, hardware: Hwinfo.for(conn.name)) end diff --git a/src/lib/y2network/virtual_interface.rb b/src/lib/y2network/virtual_interface.rb index f9bcecda0..a829b17fd 100644 --- a/src/lib/y2network/virtual_interface.rb +++ b/src/lib/y2network/virtual_interface.rb @@ -28,8 +28,8 @@ class VirtualInterface < Interface # # @param conn [ConnectionConfig] Connection configuration related to the # network interface - def self.from_connection(name, conn) - new(name, type: conn.type) + def self.from_connection(conn) + new(conn.interface || conn.name, type: conn.type) end end end diff --git a/test/y2network/virtual_interface_test.rb b/test/y2network/virtual_interface_test.rb index afe30ed35..f69a68152 100644 --- a/test/y2network/virtual_interface_test.rb +++ b/test/y2network/virtual_interface_test.rb @@ -19,7 +19,23 @@ require_relative "../test_helper" require "y2network/virtual_interface" +require "y2network/connection_config/bridge" describe Y2Network::VirtualInterface do - subject(:interface) { described_class.new("br0") } + subject(:interface) { described_class.new("br0", type: type) } + + let(:type) { Y2Network::InterfaceType::BRIDGE } + + describe ".from_connection" do + let(:conn) do + Y2Network::ConnectionConfig::Bridge.new.tap { |c| c.name = "br0" } + end + + it "returns a virtual interface using connection's and type" do + interface = described_class.from_connection(conn) + expect(interface).to be_a(described_class) + expect(interface.name).to eq("br0") + expect(interface.type).to eq(Y2Network::InterfaceType::BRIDGE) + end + end end From 980070a0d42a9dac110055b3feea915afeb69160 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 3 Sep 2019 14:18:47 +0200 Subject: [PATCH 293/471] implement changing hostname for interface --- src/lib/y2network/interface_config_builder.rb | 22 ++++++++++++++++--- test/y2network/widgets/boot_protocol_test.rb | 2 -- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 9295c3d49..e6856bbb3 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -29,6 +29,7 @@ Yast.import "LanItems" Yast.import "NetworkInterfaces" +Yast.import "Host" module Y2Network # Collects data from the UI until we have enough of it to create a @@ -85,6 +86,7 @@ def initialize(type:, config: nil) config.propose end @connection_config = config + @original_ip_config = ip_config_default end # Sets the interface name @@ -127,6 +129,8 @@ def save firewall_interface.zone = firewall_zone if !firewall_interface.zone || firewall_zone != firewall_interface.zone.name end + save_hostname + nil end @@ -328,13 +332,25 @@ def subnet_prefix=(value) # @return [String] def hostname - # TODO: write it - "" + return @hostname if @hostname + + names = Yast::Host.names(@original_ip_config.address.to_s) + @original_hostname = @hostname = names.first || "" end # @param [String] value def hostname=(value) - # TODO: write it + @hostname = value + end + + def save_hostname + # avoid unncessary modification + return if @original_ip_config == @connection_config.ip && @original_hostname == hostname + + # remove old ip + Yast::Host.remove_ip(@original_ip_config.ip.address.to_s) if @original_ip_config != @connection_config.ip + + Yast::Host.Update(@original_hostname, hostname, @connection_config.ip.address.to_s) end # sets remote ip for ptp connections diff --git a/test/y2network/widgets/boot_protocol_test.rb b/test/y2network/widgets/boot_protocol_test.rb index 3c45ee93e..1708522a3 100644 --- a/test/y2network/widgets/boot_protocol_test.rb +++ b/test/y2network/widgets/boot_protocol_test.rb @@ -79,7 +79,6 @@ def expect_set_widget(id, value, value_type: :Value) end it "sets hostname" do - pending "write it" expect_set_widget(:bootproto_hostname, "pepa") subject.init @@ -209,7 +208,6 @@ def expect_set_widget(id, value, value_type: :Value) end it "sets hostname to value of hostname widget" do - pending "write hostname" allow(Yast::UI).to receive(:QueryWidget).with(:bootproto_hostname, :Value).and_return("test.suse.cz") subject.store From 74d8b5399ac1ca62990273e3cbf4b3d837a6031f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 13:27:28 +0100 Subject: [PATCH 294/471] Move .from_connection to Interface * For the time being, implementation for PhysicalInterface and VirtualInterface would be the same. --- src/lib/y2network/config.rb | 3 +-- src/lib/y2network/interface.rb | 10 ++++++++ .../connection_config_readers/bridge.rb | 2 +- src/lib/y2network/virtual_interface.rb | 9 ------- test/y2network/config_test.rb | 4 ++-- test/y2network/interface_test.rb | 24 +++++++++++++++++++ test/y2network/virtual_interface_test.rb | 13 ---------- 7 files changed, 38 insertions(+), 27 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index be298a97a..0e4d5c236 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -156,10 +156,9 @@ def delete_interface(name) # If it is a virtual connection, it adds interface if it does not exist. def add_or_update_connection_config(connection_config) connections.add_or_update(connection_config) - return unless connection_config.virtual? interface = interfaces.by_name(connection_config.interface) return if interface - interfaces << VirtualInterface.from_connection(connection_config) + interfaces << Interface.from_connection(connection_config) end alias_method :eql?, :== diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 4a2df177b..08c1fa376 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -53,6 +53,16 @@ class Interface # @return [String,nil] attr_reader :old_name + class << self + # Builds an interface based on a connection + # + # @param conn [ConnectionConfig] Connection configuration related to the network interface + def from_connection(conn) + interface_class = conn.virtual? ? VirtualInterface : PhysicalInterface + interface_class.new(conn.interface || conn.name, type: conn.type) + end + end + # Shortcuts for accessing interfaces' ifcfg options # # TODO: this makes Interface class tighly coupled with netconfig (sysconfig) backend diff --git a/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb b/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb index 827e2d838..9b73d9633 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb @@ -29,7 +29,7 @@ class Bridge < Base # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) - conn.ports = file.bridge_ports.split(" ") + conn.ports = file.bridge_ports.to_s.split(" ") conn.stp = file.bridge_stp conn.forward_delay = file.bridge_forwarddelay end diff --git a/src/lib/y2network/virtual_interface.rb b/src/lib/y2network/virtual_interface.rb index a829b17fd..899a1d2dd 100644 --- a/src/lib/y2network/virtual_interface.rb +++ b/src/lib/y2network/virtual_interface.rb @@ -22,14 +22,5 @@ module Y2Network # Virtual Interface Class (veth, bond, bridge, vlan, dummy...) class VirtualInterface < Interface - # Build connection - # - # @todo Would be possible to get the name from the connection? - # - # @param conn [ConnectionConfig] Connection configuration related to the - # network interface - def self.from_connection(conn) - new(conn.interface || conn.name, type: conn.type) - end end end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 4cb3063da..b9b6ec09d 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -220,14 +220,14 @@ end end - context "when is a virtual connection config" do + context "when the interface is missing" do let(:new_conn) do Y2Network::ConnectionConfig::Bridge.new.tap do |conn| conn.interface = "br0" end end - it "adds the corresponding virtual interface" do + it "adds the corresponding interface" do config.add_or_update_connection_config(new_conn) expect(config.interfaces.by_name("br0")).to be_a(Y2Network::VirtualInterface) end diff --git a/test/y2network/interface_test.rb b/test/y2network/interface_test.rb index 62c3d90db..d3bfc7926 100644 --- a/test/y2network/interface_test.rb +++ b/test/y2network/interface_test.rb @@ -24,6 +24,30 @@ described_class.new("eth0") end + describe ".from_connection" do + context "when the connection is virtual" do + let(:conn) do + Y2Network::ConnectionConfig::Bridge.new.tap { |c| c.name = "br0" } + end + + it "returns a virtual interface" do + interface = described_class.from_connection(conn) + expect(interface).to be_a(Y2Network::VirtualInterface) + end + end + + context "when the connection is not virtual" do + let(:conn) do + Y2Network::ConnectionConfig::Wireless.new.tap { |c| c.name = "wlan0" } + end + + it "returns a physical interface" do + interface = described_class.from_connection(conn) + expect(interface).to be_a(Y2Network::PhysicalInterface) + end + end + end + describe "#==" do context "given two interfaces with the same name" do let(:other) { Y2Network::Interface.new(interface.name) } diff --git a/test/y2network/virtual_interface_test.rb b/test/y2network/virtual_interface_test.rb index f69a68152..5f3e0015b 100644 --- a/test/y2network/virtual_interface_test.rb +++ b/test/y2network/virtual_interface_test.rb @@ -25,17 +25,4 @@ subject(:interface) { described_class.new("br0", type: type) } let(:type) { Y2Network::InterfaceType::BRIDGE } - - describe ".from_connection" do - let(:conn) do - Y2Network::ConnectionConfig::Bridge.new.tap { |c| c.name = "br0" } - end - - it "returns a virtual interface using connection's and type" do - interface = described_class.from_connection(conn) - expect(interface).to be_a(described_class) - expect(interface.name).to eq("br0") - expect(interface.type).to eq(Y2Network::InterfaceType::BRIDGE) - end - end end From 611846fbba900ac6a805f815d033f02cb6ab7e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 13:28:04 +0100 Subject: [PATCH 295/471] Do not try to rename when no hardware info exists --- src/lib/y2network/widgets/interface_naming.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/y2network/widgets/interface_naming.rb b/src/lib/y2network/widgets/interface_naming.rb index 6f8d77522..c733fb173 100644 --- a/src/lib/y2network/widgets/interface_naming.rb +++ b/src/lib/y2network/widgets/interface_naming.rb @@ -40,6 +40,7 @@ def contents private def udev_based_rename? + return false unless @builder.interface hardware = @builder.interface.hardware return false unless hardware !!(hardware.mac || hardware.busid) From 0495d6b3b9716b4e81abd7cd7250c5ebf23698ed Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 3 Sep 2019 14:31:51 +0200 Subject: [PATCH 296/471] fix typo --- src/lib/y2network/interface_config_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index e6856bbb3..baac7ca19 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -344,7 +344,7 @@ def hostname=(value) end def save_hostname - # avoid unncessary modification + # avoid unnecessary modification return if @original_ip_config == @connection_config.ip && @original_hostname == hostname # remove old ip From eba549f77a3528390e6f31c04bab894cbecc6967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 13:48:18 +0100 Subject: [PATCH 297/471] Makes conn.ports assignment more readable --- src/lib/y2network/sysconfig/connection_config_readers/bridge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb b/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb index 9b73d9633..f62add362 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb @@ -29,7 +29,7 @@ class Bridge < Base # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) - conn.ports = file.bridge_ports.to_s.split(" ") + conn.ports = file.bridge_ports ? file.bridge_ports.split(" ") : [] conn.stp = file.bridge_stp conn.forward_delay = file.bridge_forwarddelay end From 7d1af62244bda33f1e66b81249f47ea8fb43b669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 13:53:00 +0100 Subject: [PATCH 298/471] Improve Config#add_or_update_connection_config documentation --- src/lib/y2network/config.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 0e4d5c236..14c79b5a5 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -153,7 +153,8 @@ def delete_interface(name) # Adds or update a connection config # - # If it is a virtual connection, it adds interface if it does not exist. + # If the interface which is associated to does not exist (because it is a virtual one or it is + # not present), it gets added. def add_or_update_connection_config(connection_config) connections.add_or_update(connection_config) interface = interfaces.by_name(connection_config.interface) From 394df133db0e8817755e7aae2bf27722a7860b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 16:08:54 +0100 Subject: [PATCH 299/471] Rename first, update later --- src/lib/y2network/interface_config_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index ddbae14ec..ebd2f49e4 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -117,8 +117,8 @@ def save @connection_config.name = name @connection_config.interface = name - yast_config.add_or_update_connection_config(@connection_config) yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? + yast_config.add_or_update_connection_config(@connection_config) # write to ifcfg always and to firewalld only when available @connection_config.firewall_zone = firewall_zone From 1a43f21f57f4bb808d39f901414def3ff552cb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 16:14:37 +0100 Subject: [PATCH 300/471] Drop InterfacesCollection#all --- src/lib/y2network/interfaces_collection.rb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index 501d429a2..dec0031e3 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -46,7 +46,7 @@ class InterfacesCollection attr_reader :interfaces alias_method :to_a, :interfaces - def_delegators :@interfaces, :each, :push, :<<, :reject!, :map, :flat_map, :any?, :size + def_delegators :@interfaces, :each, :push, :<<, :reject!, :map, :flat_map, :any?, :size, :select # Constructor # @@ -157,16 +157,5 @@ def bond_index index end - - def all - # FIXME: this is only helper when coexisting with old LanItems module - # can be used in new API of network-ng for read-only methods. It converts - # old LanItems::Items into new Interface objects - Yast::LanItems.Items.map do |_index, item| - name = item["ifcfg"] || item["hwinfo"]["dev_name"] - type = Yast::NetworkInterfaces.GetType(name) - Y2Network::Interface.new(name, type: InterfaceType.from_short_name(type)) - end - end end end From 055ddf1b24705ee2b389002a718f0534aa7344d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 16:09:29 +0100 Subject: [PATCH 301/471] Use the correct list when looking for "bridgeable devices" --- src/lib/y2network/interface_config_builder.rb | 7 +++++++ src/lib/y2network/interface_config_builders/bridge.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index ebd2f49e4..19ac11676 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -436,6 +436,13 @@ def find_interface yast_config.interfaces.by_name(name) end + # Returns the interfaces collection + # + # @return [Y2Network::InterfacesCollection] + def interfaces + yast_config.interfaces + end + # Helper method to access to the current configuration # # @return [Y2Network::Config] diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index 809bfb795..4dbd20360 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -44,7 +44,7 @@ def already_configured?(devices) # @return [Array] list of interfaces usable in the bridge def bridgeable_interfaces - interfaces.all.select { |i| bridgeable?(i) } + interfaces.select { |i| bridgeable?(i) } end def_delegators :@connection_config, From b5ac5c1ba9e2c6b15d5ee72a4fdc90acf2e0b444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 16:14:21 +0100 Subject: [PATCH 302/471] Use the correct list when looking for "bondable devices" --- src/lib/y2network/interface_config_builders/bonding.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 22b3badbd..3271ebac5 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -33,7 +33,7 @@ def initialize(config: nil) # @return [Array] list of interfaces usable for the bond device def bondable_interfaces - interfaces.all.select { |i| bondable?(i) } + interfaces.select { |i| bondable?(i) } end def_delegators :connection_config, From e1a2124ac25ad5af24e4a1d11d756c465b4febf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 16:23:11 +0100 Subject: [PATCH 303/471] Fix save_hostname to not crash when configuration changes --- src/lib/y2network/interface_config_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 19ac11676..12f024ff5 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -348,7 +348,7 @@ def save_hostname return if @original_ip_config == @connection_config.ip && @original_hostname == hostname # remove old ip - Yast::Host.remove_ip(@original_ip_config.ip.address.to_s) if @original_ip_config != @connection_config.ip + Yast::Host.remove_ip(@original_ip_config.address.to_s) if @original_ip_config != @connection_config.ip Yast::Host.Update(@original_hostname, hostname, @connection_config.ip.address.to_s) end From 70e4bf8f2f9ed70f8bcf64d06fbd870f002a6ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 3 Sep 2019 17:17:09 +0100 Subject: [PATCH 304/471] Take the boot protocol into account when writing the hostname --- src/lib/y2network/interface_config_builder.rb | 20 ++++++--- .../interface_config_builder_test.rb | 41 +++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 12f024ff5..7bb5e3386 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -343,13 +343,16 @@ def hostname=(value) @hostname = value end + # Saves the hostname + # + # It needs to take into account whether the old configuration and the boot protocol. def save_hostname - # avoid unnecessary modification - return if @original_ip_config == @connection_config.ip && @original_hostname == hostname - - # remove old ip - Yast::Host.remove_ip(@original_ip_config.address.to_s) if @original_ip_config != @connection_config.ip + if !required_ip_config? || hostname.empty? + Yast::Host.remove_ip(@original_ip_config.address.to_s) + return + end + return if @original_ip_config == connection_config.ip && @original_hostname == hostname Yast::Host.Update(@original_hostname, hostname, @connection_config.ip.address.to_s) end @@ -449,5 +452,12 @@ def interfaces def yast_config Yast::Lan.yast_config end + + # Determines whether the IP configuration is required + # + # @return [Boolean] + def required_ip_config? + boot_protocol == BootProtocol::STATIC + end end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index b55b0ed99..7748c8fcf 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -161,4 +161,45 @@ end end end + + describe "#save_hostname" do + before do + expect(Yast::Host).to receive(:names).with("0.0.0.0").and_return(["original.example.net"]) + config_builder.hostname # FIXME: Force hostname initialization (it should be done implicitly) + end + + context "when the configuration has changed" do + before do + config_builder.hostname = "new.example.net" + config_builder.ip_address = "192.168.122.1" + end + + it "updates the hostname" do + expect(Yast::Host).to receive(:Update) + .with("original.example.net", "new.example.net", "192.168.122.1") + config_builder.save_hostname + end + end + + context "when configuration has not changed" do + it "does not change the hostname" do + expect(Yast::Host).to_not receive(:remove_ip) + expect(Yast::Host).to_not receive(:Update) + + config_builder.save_hostname + end + end + + context "when there is no IP configuration" do + before do + config_builder.boot_protocol = "none" + config_builder.ip_address = "192.168.122.1" + end + + it "removes old hostname if it exists" do + expect(Yast::Host).to receive(:remove_ip) + config_builder.save_hostname + end + end + end end From 6e54b7e539607e7dd1adeee552f016e71656021c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 09:47:10 +0100 Subject: [PATCH 305/471] Add IPConfig#{copy,==} methods * Use a mixin to add the #copy method and use it for Y2Network::Config too. --- src/lib/y2network/can_be_copied.rb | 28 ++++++++++++++ src/lib/y2network/config.rb | 10 ++--- .../y2network/connection_config/ip_config.rb | 13 +++++++ test/y2network/can_be_copied_test.rb | 38 +++++++++++++++++++ 4 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 src/lib/y2network/can_be_copied.rb create mode 100644 test/y2network/can_be_copied_test.rb diff --git a/src/lib/y2network/can_be_copied.rb b/src/lib/y2network/can_be_copied.rb new file mode 100644 index 000000000..958932fd5 --- /dev/null +++ b/src/lib/y2network/can_be_copied.rb @@ -0,0 +1,28 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +module Y2Network + # This module adds a #copy method. + module CanBeCopied + # Returns a deep-copy of the configuration + def copy + Marshal.load(Marshal.dump(self)) + end + end +end diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 14c79b5a5..429e1f06d 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -23,6 +23,7 @@ require "y2network/interfaces_collection" require "y2network/connection_configs_collection" require "y2network/virtual_interface" +require "y2network/can_be_copied" module Y2Network # This class represents the current network configuration including interfaces, @@ -38,6 +39,8 @@ module Y2Network # config.routing.tables.first << route # config.write class Config + include CanBeCopied + # @return [InterfacesCollection] attr_accessor :interfaces # @return [ConnectionConfigsCollection] @@ -115,13 +118,6 @@ def write(original: nil) Y2Network::ConfigWriter.for(source).write(self, original) end - # Returns a deep-copy of the configuration - # - # @return [Config] - def copy - Marshal.load(Marshal.dump(self)) - end - # Determines whether two configurations are equal # # @return [Boolean] true if both configurations are equal; false otherwise diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index f79f542df..61b92ed91 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -16,9 +16,14 @@ # # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. + +require "y2network/can_be_copied" + module Y2Network module ConnectionConfig class IPConfig + include CanBeCopied + # @return [IPAddress] IP address attr_accessor :address # @return [String,nil] Address label @@ -45,6 +50,14 @@ def initialize(address, id: "", label: nil, remote_address: nil, broadcast: nil) @remote_address = remote_address @broadcast = broadcast end + + # Determines whether IP configurations are equal + # + # @return [Boolean] true if both are equal; false otherwise + def ==(other) + address == other.address && label == other.label && + remote_address == other.remote_address && broadcast == other.broadcast + end end end end diff --git a/test/y2network/can_be_copied_test.rb b/test/y2network/can_be_copied_test.rb new file mode 100644 index 000000000..615e6df5b --- /dev/null +++ b/test/y2network/can_be_copied_test.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" + +require "y2network/can_be_copied" + +describe Y2Network::CanBeCopied do + Dummy = Struct.new(:value) do + include Y2Network::CanBeCopied + end + + subject { Dummy.new("test") } + + describe "#copy" do + it "returns an equivalent but different object" do + other = subject.copy + expect(subject.value).to eq(other.value) + expect(subject).to_not be(other) + end + end +end From a3ef8b6729a5984149a1738ac512f79d319747b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 09:54:15 +0100 Subject: [PATCH 306/471] Fixes InterfaceConfigBuilder#save_hostname behaviour * Extends unit tests. --- src/lib/y2network/interface_config_builder.rb | 8 ++-- .../interface_config_builder_test.rb | 42 ++++++++++++++++--- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 7bb5e3386..295c4bf26 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -86,7 +86,7 @@ def initialize(type:, config: nil) config.propose end @connection_config = config - @original_ip_config = ip_config_default + @original_ip_config = ip_config_default.copy end # Sets the interface name @@ -345,9 +345,11 @@ def hostname=(value) # Saves the hostname # - # It needs to take into account whether the old configuration and the boot protocol. + # The hostname entry must be updated when the IP or the hostname change. Moreover, it must be + # removed when the hostname is empty or when the boot protocol is not STATIC (as there is no IP + # to associate with the name). def save_hostname - if !required_ip_config? || hostname.empty? + if !required_ip_config? Yast::Host.remove_ip(@original_ip_config.address.to_s) return end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 7748c8fcf..1f848be9d 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -163,20 +163,52 @@ end describe "#save_hostname" do + subject(:config_builder) { Y2Network::InterfaceConfigBuilder.for("eth", config: conn) } + let(:conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.ip = original_ip_config } + end + + let(:original_ip_config) do + Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.new("10.0.0.1")) + end + before do - expect(Yast::Host).to receive(:names).with("0.0.0.0").and_return(["original.example.net"]) + allow(Yast::Host).to receive(:names).with("10.0.0.1").and_return(["original.example.net"]) config_builder.hostname # FIXME: Force hostname initialization (it should be done implicitly) end - context "when the configuration has changed" do + context "when the hostname has changed" do before do config_builder.hostname = "new.example.net" - config_builder.ip_address = "192.168.122.1" end it "updates the hostname" do expect(Yast::Host).to receive(:Update) - .with("original.example.net", "new.example.net", "192.168.122.1") + .with("original.example.net", "new.example.net", "10.0.0.1") + config_builder.save_hostname + end + + context "and the hostname is empty" do + before do + config_builder.hostname = "" + end + + it "removes the hostname" do + expect(Yast::Host).to receive(:Update) + .with("original.example.net", "", "10.0.0.1") + config_builder.save_hostname + end + end + end + + context "when the IP has changed" do + before do + config_builder.ip_address = "192.168.122.1" + end + + it "updates the IP" do + expect(Yast::Host).to receive(:Update) + .with("original.example.net", "original.example.net", "192.168.122.1") config_builder.save_hostname end end @@ -190,7 +222,7 @@ end end - context "when there is no IP configuration" do + context "when there is boot protocol is not static" do before do config_builder.boot_protocol = "none" config_builder.ip_address = "192.168.122.1" From 8580dc6ca02741b7a54f94b2aa1b2665b89d5a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 09:57:05 +0100 Subject: [PATCH 307/471] Replace yast_config.interfaces with the new #interfaces method --- src/lib/y2network/interface_config_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 295c4bf26..77df0503e 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -438,7 +438,7 @@ def interface=(iface) # @return [Y2Network::Interface,nil] def find_interface return nil unless yast_config # in some tests, it could return nil - yast_config.interfaces.by_name(name) + interfaces.by_name(name) end # Returns the interfaces collection From e1009db975da35f1a5e3236f26e6b5436784f134 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 4 Sep 2019 16:51:03 +0200 Subject: [PATCH 308/471] WIP for autoyast interfaces --- .../y2network/autoinst/interfaces_reader.rb | 66 ++++ .../autoinst_profile/interface_section.rb | 320 ++++++++++++++++++ .../autoinst_profile/interfaces_section.rb | 108 ++++++ .../autoinst_profile/networking_section.rb | 10 +- 4 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 src/lib/y2network/autoinst/interfaces_reader.rb create mode 100644 src/lib/y2network/autoinst_profile/interface_section.rb create mode 100644 src/lib/y2network/autoinst_profile/interfaces_section.rb diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb new file mode 100644 index 000000000..1bdabcc2d --- /dev/null +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -0,0 +1,66 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/dns" +require "ipaddr" +Yast.import "IP" + +module Y2Network + module Autoinst + # This class is responsible of importing the AutoYast dns section + class InterfacesReader + # @return [AutoinstProfile::InterfacesSection] + attr_reader :section + + # @param section [AutoinstProfile::InterfacesSection] + # TODO: read also udev rules + def initialize(section) + @section = section + end + + # Creates a new {ConnectionConfigsCollection} config from the imported profile interfaces + # section + # @note interfaces will be created automatic from connection configs + # + # @return [ConnectionConfigsCollection] the imported connections configs + def config + configs = @section.interfaces.map do |interface_section| + config = create_config(interface_section) + # TODO: read it from section + end + + ConnectionConfigsCollection.new(configs) + end + + private + + def create_config(interface_section) + # TODO: autoyast backend for type detector? + # TODO: TUN/TAP interface missing for autoyast? + return ConnectionConfig::Bonding.new if interface_section.bonding.slave0 && !interface_section.bonding.slave0.empty? + return ConnectionConfig::Bridge.new if interface_section.bridge_ports && !interface_section.bridge_ports.empty? + return ConnectionConfig::Vlan.new if interface_section.etherdevice && !interface_section.etherdevice.empty? + return ConnectionConfig::Wireless.new if interface_section.wireless_essid && !interface_section.wireless_essid.empty? + + ConnectionConfig::Ethernet.new # TODO: use type detector to read it from sys + end + end + end +end diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb new file mode 100644 index 000000000..46defd04d --- /dev/null +++ b/src/lib/y2network/autoinst_profile/interface_section.rb @@ -0,0 +1,320 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/autoinst_profile/section_with_attributes" + +module Y2Network + module AutoinstProfile + # This class represents an AutoYaST section under + # + # + # static + # 127.255.255.255 + # lo + # no + # 127.0.0.1 + # 255.0.0.0 + # 127.0.0.0 + # 8 + # nfsroot + # no + # + # + # @see InterfacesSection + class InterfaceSection < SectionWithAttributes + def self.attributes + [ + { name: :bootproto }, + { name: :broadcast }, + { name: :device }, + { name: :name }, # has precedence over device + { name: :ipaddr }, + { name: :remote_ipaddr }, + { name: :netmask }, + { name: :network }, # TODO: what it is? looks like ipaddr with applied prefix + { name: :prefixlen }, # has precedence over netmask + { name: :startmode }, + { name: :ifplugd_priority }, + { name: :usercontrol }, # no longer used, ignored + { name: :dhclient_set_hostname }, + { name: :bonding_master }, + { name: :bonding_slave0 }, + { name: :bonding_slave1 }, + { name: :bonding_slave2 }, + { name: :bonding_slave3 }, + { name: :bonding_slave4 }, + { name: :bonding_slave5 }, + { name: :bonding_slave6 }, + { name: :bonding_slave7 }, + { name: :bonding_slave8 }, + { name: :bonding_slave9 }, + { name: :bonding_module_opts }, + { name: :aliases }, + { name: :mtu }, + { name: :ethtool_options }, + { name: :wireless }, # TODO: what it is? + { name: :firewall }, # yes/no + { name: :zone }, # firewall zone + { name: :dhclient_set_down_link }, # TODO: what it do? + { name: :dhclient_set_default_route }, # TODO: what it do? + { name: :vlan_id }, + { name: :etherdevice }, + { name: :bridge }, # yes/no # why? bridge always have to be yes + { name: :bridge_ports }, + { name: :bridge_stp }, # on/off + { name: :bridge_forward_delay }, + { name: :wireless_ap }, + { name: :wireless_bitrate }, + { name: :wireless_ca_cert }, + { name: :wireless_channel }, + { name: :wireless_client_cert }, + { name: :wireless_client_key }, + { name: :wireless_client_key_password }, + { name: :wireless_default_key }, + { name: :wireless_eap_auth }, + { name: :wireless_eap_mode }, + { name: :wireless_essid }, + { name: :wireless_frequency }, + { name: :wireless_key }, # default wep key + { name: :wireless_key0 }, + { name: :wireless_key1 }, + { name: :wireless_key2 }, + { name: :wireless_key3 }, + { name: :wireless_key_length }, + { name: :wireless_mode }, + { name: :wireless_nick }, + { name: :wireless_nwid }, + { name: :wireless_peap_version }, + { name: :wireless_power }, + { name: :wireless_wpa_anonid }, + { name: :wireless_wpa_identity }, + { name: :wireless_wpa_password }, + { name: :wireless_wpa_psk } + ] + end + + define_attr_accessors + + # @!attribute bootproto + # @return [String] boot protocol + + # @!attribute broadcast + # @return [String] broadcast ip address. + + # @!attribute device + # @return [String] device name. Deprecated. `name` should be used instead. + + # @!attribute name + # @return [String] device name. + + # @!attribute ipaddr + # @return [String] ip address. + + # @!attribute remote_ipaddr + # @return [String] remote ip address for ptp connections. + + # @!attribute netmask + # @return [String] network mask. Deprecated `prefix` should be used instead. + + # @!attribute network + # @return [String] network ip after prefix applied. Deprecated as it can be computed from ipaddr and prefixlen. + + # @!attribute prefixlen + # @return [String] size of network prefix. + + # @!attribute startmode + # @return [String] when to start network. + + # @!attribute ifplugd_priority + # @return [String] priority for ifplugd startmode. + + # @!attribute usercontrol + # @return [String] no clue what it means, but it is ignored now. + + # @!attribute dhclient_set_hostname + # @return [String] if dhcp sets hostname. It is plain text, values? + + # @!attribute bonding_master + # @return [String] ??? + + # @!attribute bonding_slaveX + # @return [String] bonding slave on position X + + # @!attribute bonding_module_opts + # @return [String] bonding options + + # @!attribute aliases + # @return [Object] aliases for interface TODO: allows anything, so how it looks like? + + # @!attribute mtu + # @return [String] MTU for interface + + # @!attribute ethtool_options + # @return [String] options for ethtool + + # @!attribute wireless + # @return [String] ??? + + # @!attribute firewall + # @return [String] ??? + + # @!attribute zone + # @return [String] firewall zone to which interface belongs + + # @!attribute dhclient_set_down_link + # @return [String] ??? + + # @!attribute dhclient_set_default_route + # @return [String] ??? + + # @!attribute vlan_id + # @return [String] id of vlan + + # @!attribute etherdevice + # @return [String] parent device of vlan + + # @!attribute bridge + # @return [String] "yes" if device is bridge + + # @!attribute bridge_ports + # @return [String] bridge ports separated by space + + # @!attribute bridge_stp + # @return [String] "on" if stp is enabled + + # @!attribute bridge_forward_delay + # @return [String] time of delay + + # @!attribute wireless_ap + # @!attribute wireless_bitrate + # @!attribute wireless_ca_cert + # @!attribute wireless_channel + # @!attribute wireless_client_cert + # @!attribute wireless_client_key + # @!attribute wireless_client_key_password + # @!attribute wireless_default_key + # @!attribute wireless_eap_auth + # @!attribute wireless_eap_mode + # @!attribute wireless_essid + # @!attribute wireless_frequency + # @!attribute wireless_key + # @!attribute wireless_keyX + # @return [String] key on position X + # @!attribute wireless_key_length + # @!attribute wireless_mode + # @!attribute wireless_nick + # @!attribute wireless_nwid + # @!attribute wireless_peap_version + # @!attribute wireless_power + # @!attribute wireless_wpa_anonid + # @!attribute wireless_wpa_identity + # @!attribute wireless_wpa_password + # @!attribute wireless_wpa_psk + + # Clones a network interface into an AutoYaST interface section + # + # @param route [Y2Network::ConnectionConfig] Network connection config + # @return [InterfacesSection] + def self.new_from_network(connection_config) + result = new + result.init_from_config(connection_config) + result + end + + def initialize(*_args) + super + + self.class.attributes.each do |attr| + # init everything to empty string + self.public.send(:"#{attr}=", "") + end + end + + # Method used by {.new_from_network} to populate the attributes when cloning a network interface + # + # @param config [Y2Network::ConnectionConfig] + # @return [Boolean] + def init_from_config(config) + @bootproto = config.bootproto.name + @name = config.name + if config.bootproto == BootProtocol::STATIC + @ipaddr = config.ip.address.to_s + @prefixlen = config.ip.address.address.to_s + @remote_ipaddr = config.ip.remote_address.address.to_s if config.ip.remote_address + @broadcast = config.ip.broadcast.address.to_s + end + + @startmode = config.startmode.name + @ifplugd_priority = config.startmode.priority.to_s if config.startmode.name == "ifplugd" + @mtu = config.mtu.to_s if config.mtu + @ethtool_options = config.ethtool_options if config.ethtool_options + @zone = config.firewall_zone.to_s + # TODO: aliases but format is unknown + + case config + when ConnectionConfig::Vlan + @vlan_id = config.vlan_id.to_s + @etherdevice = config.parent_device + when ConnectionConfig::Bridge + @bridge = "yes" + @bridge_ports = config.ports.join(" ") + @bridge_stp = config.stp ? "on" : "off" + @bridge_forward_delay = config.forward_delay.to_s + when ConnectionConfig::Bonding + @bonding_module_opts = config.options + config.slaves.each_with_index do |slave, index| + public_send(:"bonding_slave#{index}=", slave) + end + when ConnectionConfig::Wireless + init_from_wireless(config) + end + + true + end + + private + + def init_from_wireless(config) + @wireless_mode = config.mode + @wireless_ap = config.ap + @wireless_bitrate = config.bitrate.to_s + @wireless_ca_cert = config.ca_cert + @wireless_channel = config.channel.to_s if config.channel + @wireless_client_cert = config.client_cert + @wireless_client_key = config.client_key + @wireless_essid = config.essid + @wireless_mode = config.auth_mode.to_s + @wireless_nick = config.nick + @wireless_nwid = config.nwid + @wireless_wpa_anonid = config.wpa_anonymous_identity + @wireless_wpa_identity = config.wpa_identity + @wireless_wpa_password = config.wpa_password + @wireless_wpa_psk = config.wpa_psk + config.keys.each_with_index do |key, index| + public_send(:"wireless_key#{index}=", key) + end + @wireless_key = config.default_key.to_s + @wireless_key_length = config.key_length.to_s + # power dropped + # peap version not supported yet + # on other hand ap scan mode is not in autoyast + end + end + end +end diff --git a/src/lib/y2network/autoinst_profile/interfaces_section.rb b/src/lib/y2network/autoinst_profile/interfaces_section.rb new file mode 100644 index 000000000..f8e3e6f63 --- /dev/null +++ b/src/lib/y2network/autoinst_profile/interfaces_section.rb @@ -0,0 +1,108 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/autoinst_profile/section_with_attributes" +require "y2network/autoinst_profile/interface_section" + +module Y2Network + module AutoinstProfile + # This class represents an AutoYaST section under + # + # + # + # dhcp + # eth0 + # auto + # + # + # static + # 127.255.255.255 + # lo + # no + # 127.0.0.1 + # 255.0.0.0 + # 127.0.0.0 + # 8 + # nfsroot + # no + # + # + # + # @see NetworkingSection + class InterfacesSection < SectionWithAttributes + def self.attributes + [ + { name: :interfaces } + ] + end + + define_attr_accessors + + # @!attribute interfaces + # @return [Array] + + # Clones network interfaces settings into an AutoYaST interfaces section + # + # @param routing [Y2Network::Config] whole config as it need both interfaces and connection configs + # @return [InterfacesSection] + def self.new_from_network(config) + result = new + initialized = result.init_from_network(config) + initialized ? result : nil + end + + # Constructor + def initialize(*_args) + super + @interfaces = [] + end + + # Method used by {.new_from_hashes} to populate the attributes when importing a profile + # + # @param hash [Hash] see {.new_from_hashes} + def init_from_hashes(hash) + super + @interfaces = connection_configs_from_hash(hash) + end + + # Method used by {.new_from_network} to populate the attributes when cloning routing settings + # + # @param connection_configs [Y2Network::ConnectionConfigsCollection] Network settings + # @return [Boolean] Result true on success or false otherwise + def init_from_network(connection_configs) + @interfaces = interfaces_section(connection_configs) + true + end + + private + + # Returns an array of interfaces sections + # + # @param hash [Hash] Interfaces section hash + def interfaces_from_hash(hash) + hashes = hash["interfaces"] || [] + hashes.map { |h| InterfaceSection.new_from_hashes(h) } + end + + def interfaces_section(connection_configs) + connection_configs.map { |c| Y2Network::AutoinstProfile::InterfaceSection.new_from_network(c) } + end + end + end +end diff --git a/src/lib/y2network/autoinst_profile/networking_section.rb b/src/lib/y2network/autoinst_profile/networking_section.rb index a05eaf892..960de569a 100644 --- a/src/lib/y2network/autoinst_profile/networking_section.rb +++ b/src/lib/y2network/autoinst_profile/networking_section.rb @@ -36,6 +36,8 @@ class NetworkingSection attr_accessor :routing # @return [DNSSection] attr_accessor :dns + # @return [InterfacesSection] + attr_accessor :interfaces # Creates an instance based on the profile representation used by the AutoYaST modules # (hash with nested hashes and arrays). @@ -46,6 +48,7 @@ def self.new_from_hashes(hash) result = new result.routing = RoutingSection.new_from_hashes(hash["routing"]) if hash["routing"] result.dns = DNSSection.new_from_hashes(hash["dns"]) if hash["dns"] + result.interfaces = InterfacesSection.new_from_hashes(hash["interfaces"]) if hash["interfaces"] result end @@ -58,6 +61,7 @@ def self.new_from_network(config) return result unless config result.routing = RoutingSection.new_from_network(config.routing) if config.routing result.dns = DNSSection.new_from_network(config.dns) if config.dns + result.interfaces = InterfacesSection.new_from_network(config.connections) if config.dns result end @@ -65,7 +69,11 @@ def self.new_from_network(config) # # @return [Hash] def to_hashes - { "routing" => routing.to_hashes } + { + "routing" => routing.to_hashes, + "dns" => dns.to_hashes, + "interfaces" => interfaces.to_hashes, + } end end end From 04b8f64a2384a268387f633e650edecf27f460dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 12:57:19 +0100 Subject: [PATCH 309/471] Add a method to find all interface configuration files (ifcfg-*) --- src/lib/y2network/sysconfig/interface_file.rb | 12 ++++++++++++ .../y2network/sysconfig/interfaces_reader.rb | 18 ++++-------------- .../y2network/sysconfig/interface_file_test.rb | 9 +++++++++ 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 350c02a4e..4cea8753a 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -55,6 +55,18 @@ class InterfaceFile class << self SYSCONFIG_NETWORK_DIR = Pathname.new("/etc/sysconfig/network").freeze + # @return [Regex] expression to filter out invalid ifcfg-* files + IGNORE_IFCFG_REGEX = /(\.bak|\.orig|\.rpmnew|\.rpmorig|-range|~|\.old|\.scpmbackup)$/ + + # Returns all configuration files + # + # @return [Array] + def all + Yast::SCR.Dir(Yast::Path.new(".network.section")) + .reject { |f| IGNORE_IFCFG_REGEX =~ f || f == "lo" } + .map { |f| find(f) } + end + # Finds the ifcfg-* file for a given interface # # @param interface [String] Interface name diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 5e6d8a5a1..18f64ffb6 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -23,6 +23,7 @@ require "y2network/virtual_interface" require "y2network/physical_interface" require "y2network/sysconfig/connection_config_reader" +require "y2network/sysconfig/interface_file" require "y2network/interfaces_collection" require "y2network/connection_configs_collection" require "y2network/sysconfig/type_detector" @@ -79,10 +80,10 @@ def find_physical_interfaces # Finds the connections configurations def find_connections @connections ||= - configured_devices.each_with_object(ConnectionConfigsCollection.new([])) do |name, conns| - interface = @interfaces.by_name(name) + InterfaceFile.all.each_with_object(ConnectionConfigsCollection.new([])) do |file, conns| + interface = @interfaces.by_name(file.interface) connection = ConnectionConfigReader.new.read( - name, + file.interface, interface ? interface.type : nil ) next unless connection @@ -101,17 +102,6 @@ def build_physical_interface(hwinfo) end end - # @return [Regex] expression to filter out invalid ifcfg-* files - IGNORE_IFCFG_REGEX = /(\.bak|\.orig|\.rpmnew|\.rpmorig|-range|~|\.old|\.scpmbackup)$/ - - # List of devices which has a configuration file (ifcfg-*) - # - # @return [Array] List of configured devices - def configured_devices - files = Yast::SCR.Dir(Yast::Path.new(".network.section")) - files.reject { |f| IGNORE_IFCFG_REGEX =~ f || f == "lo" } - end - # Adds a fake or virtual interface for a given connection # # It may happen that a configured interface is not plugged diff --git a/test/y2network/sysconfig/interface_file_test.rb b/test/y2network/sysconfig/interface_file_test.rb index 498fc8b9d..713a39640 100644 --- a/test/y2network/sysconfig/interface_file_test.rb +++ b/test/y2network/sysconfig/interface_file_test.rb @@ -56,6 +56,15 @@ def file_content(scr_root, file) end end + describe ".all" do + it "returns all the present interfaces files" do + files = described_class.all + expect(files).to be_all(Y2Network::Sysconfig::InterfaceFile) + interfaces = files.map(&:interface) + expect(interfaces).to include("wlan0") + end + end + describe "#remove" do subject(:file) { described_class.find("eth0") } From ff369c6bc62c5f80a5cff2d3763cab5dbd23390f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 14:50:01 +0100 Subject: [PATCH 310/471] Fix DHCLIENT_SET_HOSTNAME to support network interface names --- src/lib/y2network/dns.rb | 4 +- src/lib/y2network/sysconfig/dns_reader.rb | 10 ++- src/lib/y2network/sysconfig/dns_writer.rb | 16 +++-- src/lib/y2network/sysconfig/interface_file.rb | 4 ++ test/y2network/sysconfig/dns_reader_test.rb | 65 +++++++++++++++++-- test/y2network/sysconfig/dns_writer_test.rb | 38 +++++++---- 6 files changed, 113 insertions(+), 24 deletions(-) diff --git a/src/lib/y2network/dns.rb b/src/lib/y2network/dns.rb index bc2f4cd6c..02840fc55 100644 --- a/src/lib/y2network/dns.rb +++ b/src/lib/y2network/dns.rb @@ -32,7 +32,9 @@ class DNS # @return [String] resolv.conf update policy attr_accessor :resolv_conf_policy - # @return [Boolean] Whether to take the hostname from DHCP + # @return [String,Symbol] Whether to take the hostname from DHCP. + # It can be an interface name (String), :any for any interface or :none from no taking + # the hostname from DHCP. attr_accessor :dhcp_hostname # @todo receive an array instead all these arguments diff --git a/src/lib/y2network/sysconfig/dns_reader.rb b/src/lib/y2network/sysconfig/dns_reader.rb index 15b85c17c..f91ff60f9 100644 --- a/src/lib/y2network/sysconfig/dns_reader.rb +++ b/src/lib/y2network/sysconfig/dns_reader.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "yast" require "y2network/dns" +require "y2network/sysconfig/interface_file" Yast.import "Hostname" Yast.import "Mode" @@ -126,10 +127,15 @@ def searchlist # Returns whether the hostname should be taken from DHCP # - # @return [Boolean] + # @return [String,:any,:none] Interface to set the hostname based on DHCP settings; + # :any for any interface; :none for ignoring the hostname assigned via DHCP def dhcp_hostname value = Yast::SCR.Read(Yast::Path.new(".sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME")) - value == "yes" + return :any if value == "yes" + files = InterfaceFile.all + files.each(&:load) + file = files.find { |f| f.dhclient_set_hostname == "yes" } + file ? file.interface : :none end end end diff --git a/src/lib/y2network/sysconfig/dns_writer.rb b/src/lib/y2network/sysconfig/dns_writer.rb index 8a28ef14e..5f411fa74 100644 --- a/src/lib/y2network/sysconfig/dns_writer.rb +++ b/src/lib/y2network/sysconfig/dns_writer.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "yast" require "yast2/execute" +require "y2network/sysconfig/interface_file" module Y2Network module Sysconfig @@ -45,18 +46,25 @@ def write(dns, old_dns) SENDMAIL_UPDATE_PATH = "/usr/lib/sendmail.d/update".freeze def update_sysconfig_dhcp(config, old_config) - if old_config && (old_config.dhcp_hostname == config.dhcp_hostname || config.dhcp_hostname.nil?) + if old_config.dhcp_hostname == config.dhcp_hostname log.info("No update for /etc/sysconfig/network/dhcp") return end - # dhcp_hostname can currently be nil only when not present in original file. So, do not - # add it in such a case. Yast::SCR.Write( Yast::Path.new(".sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME"), - config.dhcp_hostname ? "yes" : "no" + config.dhcp_hostname == :any ? "yes" : "no" ) Yast::SCR.Write(Yast::Path.new(".sysconfig.network.dhcp"), nil) + + # Clean-up values from ifcfg-* values + Y2Network::Sysconfig::InterfaceFile.all.each do |file| + value = file.interface == config.dhcp_hostname ? "yes" : nil + file.load + next if file.dhclient_set_hostname == value + file.dhclient_set_hostname = value + file.save + end end # Sets the hostname diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index 4cea8753a..bc21794b8 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -349,6 +349,10 @@ def variable_name(param_name) # @return [String] tunnel group define_variable(:tunnel_set_group) + # @!attribute [r] dhclient_set_hostname + # @return [String] use hostname from dhcp + define_variable(:dhclient_set_hostname) + # Constructor # # @param interface [String] Interface interface diff --git a/test/y2network/sysconfig/dns_reader_test.rb b/test/y2network/sysconfig/dns_reader_test.rb index efbb1836b..bc213dbd0 100644 --- a/test/y2network/sysconfig/dns_reader_test.rb +++ b/test/y2network/sysconfig/dns_reader_test.rb @@ -43,12 +43,20 @@ double("Yast::Execute", on_target!: "") end + let(:ifcfg_eth0) do + instance_double( + Y2Network::Sysconfig::InterfaceFile, interface: "eth0", dhclient_set_hostname: nil, + load: nil + ) + end + before do allow(Yast::SCR).to receive(:Read) do |arg| key_parts = arg.to_s.split(".") netconfig.dig(*key_parts[3..-1]) end allow(Yast::Execute).to receive(:stdout).and_return(executor) + allow(Y2Network::Sysconfig::InterfaceFile).to receive(:all).and_return([ifcfg_eth0]) end it "returns the DNS configuration" do @@ -160,19 +168,64 @@ end end - it "sets the dhcp_hostname parameter" do - config = reader.config - expect(config.dhcp_hostname).to eq(true) + context "when DHCLIENT_SET_HOSTNAME is set to 'yes'" do + let(:netconfig_dhcp) do + { "DHCLIENT_SET_HOSTNAME" => "yes" } + end + + it "sets dhcp_hostname to :any" do + config = reader.config + expect(config.dhcp_hostname).to eq(:any) + end end - context "when DHCLIENT_SET_HOSTNAME is not set to 'yes'" do + context "when DHCLIENT_SET_HOSTNAME is set to 'no'" do let(:netconfig_dhcp) do { "DHCLIENT_SET_HOSTNAME" => "no" } end - it "sets dhcp_hostname to false" do + it "sets dhcp_hostname to :none" do config = reader.config - expect(config.dhcp_hostname).to eq(false) + expect(config.dhcp_hostname).to eq(:none) + end + + context "when a interface configuration file has DHCLIENT_SET_HOSTNAME set to 'yes'" do + let(:ifcfg_eth0) do + instance_double( + Y2Network::Sysconfig::InterfaceFile, interface: "eth0", dhclient_set_hostname: "yes", + load: nil + ) + end + + it "returns the interface name" do + config = reader.config + expect(config.dhcp_hostname).to eq("eth0") + end + end + end + + context "when DHCLIENT_SET_HOSTNAME is missing" do + let(:netconfig_dhcp) do + { "DHCLIENT_SET_HOSTNAME" => nil } + end + + it "sets dhcp_hostname to :none" do + config = reader.config + expect(config.dhcp_hostname).to eq(:none) + end + + context "when a interface configuration file has DHCLIENT_SET_HOSTNAME set to 'yes'" do + let(:ifcfg_eth0) do + instance_double( + Y2Network::Sysconfig::InterfaceFile, interface: "eth0", dhclient_set_hostname: "yes", + load: nil + ) + end + + it "returns the interface name" do + config = reader.config + expect(config.dhcp_hostname).to eq("eth0") + end end end end diff --git a/test/y2network/sysconfig/dns_writer_test.rb b/test/y2network/sysconfig/dns_writer_test.rb index a8bce9f35..cb3151648 100644 --- a/test/y2network/sysconfig/dns_writer_test.rb +++ b/test/y2network/sysconfig/dns_writer_test.rb @@ -25,7 +25,7 @@ describe "#write" do - let(:dhcp_hostname) { true } + let(:dhcp_hostname) { :any } let(:dns) do Y2Network::DNS.new( nameservers: [IPAddr.new("10.0.0.1"), IPAddr.new("10.0.0.2")], @@ -36,7 +36,7 @@ ) end - let(:old_dhcp_hostname) { !dhcp_hostname } + let(:old_dhcp_hostname) { :none } let(:old_dns) do Y2Network::DNS.new( nameservers: [IPAddr.new("10.0.0.1")], @@ -47,14 +47,29 @@ ) end let(:hostname) { "myhost.example.net" } + let(:ifcfg_eth0) do + instance_double( + Y2Network::Sysconfig::InterfaceFile, interface: "eth0", + dhclient_set_hostname: "yes", :dhclient_set_hostname= => nil, load: nil, save: nil + ) + end + let(:ifcfg_eth1) do + instance_double( + Y2Network::Sysconfig::InterfaceFile, interface: "eth1", + dhclient_set_hostname: "no", :dhclient_set_hostname= => nil, load: nil, save: true + ) + end before do allow(Yast::SCR).to receive(:Write) allow(Yast::Execute).to receive(:on_target!) + allow(Y2Network::Sysconfig::InterfaceFile).to receive(:all) + .and_return([ifcfg_eth0, ifcfg_eth1]) end - context "when dhcp_hostname is changed to true" do - let(:dhcp_hostname) { true } + context "when dhcp_hostname is changed to :any" do + let(:old_dhcp_hostname) { :none } + let(:dhcp_hostname) { :any } it "sets DHCLIENT_SET_HOSTNAME to 'yes'" do expect(Yast::SCR).to receive(:Write) @@ -63,8 +78,9 @@ end end - context "when dhcp_hostname is changed to false" do - let(:dhcp_hostname) { false } + context "when dhcp_hostname is changed to :none" do + let(:old_dhcp_hostname) { :any } + let(:dhcp_hostname) { :none } it "writes DHCLIENT_SET_HOSTNAME to 'no'" do expect(Yast::SCR).to receive(:Write) @@ -83,12 +99,12 @@ end end - context "when dhcp_hostname is nil" do - let(:dhcp_hostname) { nil } + context "when dhcp_hostname is set to an interface name" do + let(:dhcp_hostname) { "eth1" } - it "does not write DHCLIENT_SET_HOSTNAME" do - expect(Yast::SCR).to_not receive(:Write) - .with(Yast::Path.new(".sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME"), anything) + it "sets the DHCLIENT_SET_HOSTNAME in the corresponding ifcfg-* file" do + expect(ifcfg_eth0).to receive(:dhclient_set_hostname=).with(nil) + expect(ifcfg_eth1).to receive(:dhclient_set_hostname=).with("yes") writer.write(dns, old_dns) end end From c140076429cef4cd21ff2cc4680142b43625d5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 15:20:43 +0100 Subject: [PATCH 311/471] Adjust the dhcp_hostname setting when an interface is renamed --- src/lib/y2network/config.rb | 1 + test/y2network/config_test.rb | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 14c79b5a5..ad7fa26f6 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -139,6 +139,7 @@ def rename_interface(old_name, new_name, mechanism) interface = interfaces.by_name(old_name) interface.rename(new_name, mechanism) connections.by_interface(old_name).each { |c| c.interface = new_name } + dns.dhcp_hostname = new_name if dns.dhcp_hostname == old_name end # deletes interface and all its config. If interface is physical, diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index b9b6ec09d..1037c5922 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -189,6 +189,28 @@ expect(eth2_conns).to_not be_empty end end + + context "when dhcp_hostname points to the renamed interface" do + before do + allow(config.dns).to receive(:dhcp_hostname).and_return("eth0") + end + + it "adjusts the dhcp_hostname" do + expect(config.dns).to receive(:dhcp_hostname=).with("eth1") + config.rename_interface("eth0", "eth1", :mac) + end + end + + context "when dhcp_hostname does not point to the renamed interface" do + before do + allow(config.dns).to receive(:dhcp_hostname).and_return(:any) + end + + it "does not adjust the dhcp_hostname" do + expect(config.dns).to_not receive(:dhcp_hostname=) + config.rename_interface("eth0", "eth1", :mac) + end + end end describe "#add_or_update_connection_config" do From f2f2eec5d1a8456f9785ae71d61f83d8f1e26caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 16:34:03 +0100 Subject: [PATCH 312/471] Adapt DNS.dhcp_hostname UI --- src/include/network/services/dns.rb | 51 ++++++++--------------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/src/include/network/services/dns.rb b/src/include/network/services/dns.rb index 4cdcce113..d902ddd3d 100644 --- a/src/include/network/services/dns.rb +++ b/src/include/network/services/dns.rb @@ -378,27 +378,20 @@ def use_dhcp_hostname? # Init handler for DHCP_HOSTNAME def InitDhcpHostname(_key) UI.ChangeWidget(Id("DHCP_HOSTNAME"), :Enabled, has_dhcp? && NetworkService.is_wicked) + dhcp_hostname = DNS.dhcp_hostname - hostname_ifaces = LanItems.find_set_hostname_ifaces - selected = DNS.dhcp_hostname ? ANY_LABEL : NONE_LABEL - items = [] - - if !LanItems.valid_dhcp_cfg? - fix_dhclient_warning(LanItems.invalid_dhcp_cfgs) - - selected = NO_CHANGE_LABEL - items << Item(Id(NO_CHANGE_LABEL), _("keep current settings"), true) - elsif hostname_ifaces.size == 1 - selected = hostname_ifaces.first - end - # translators: no device selected placeholder - items << Item(Id(NONE_LABEL), _("no"), selected == NONE_LABEL) - # translators: placeholder for "set hostname via any DHCP aware device" - items << Item(Id(ANY_LABEL), _("yes: any"), selected == ANY_LABEL) + items = [ + # translators: no device selected placeholder + Item(Id(:none), _("no"), dhcp_hostname == :none), + # translators: placeholder for "set hostname via any DHCP aware device" + Item(Id(:any), _("yes: any"), dhcp_hostname == :any) + ] - items += LanItems.find_dhcp_ifaces.sort.map do |iface| + config = Yast::Lan.yast_config + iface_names = config.connections.to_a.select { |c| c.bootproto.dhcp? }.map(&:interface) + items += iface_names.map do |iface| # translators: label is in form yes: - Item(Id(iface), format(_("yes: %s"), iface), iface == selected) + Item(Id(iface), format(_("yes: %s"), iface), dhcp_hostname == iface) end UI.ReplaceWidget( @@ -410,7 +403,7 @@ def InitDhcpHostname(_key) ) ) - log.info("InitDhcpHostname: preselected item = #{selected}") + log.info("InitDhcpHostname: preselected item = #{dhcp_hostname}") nil end @@ -418,25 +411,7 @@ def InitDhcpHostname(_key) # Store handler for DHCP_HOSTNAME def StoreDhcpHostname(_key, _event) return if !UI.QueryWidget(Id("DHCP_HOSTNAME"), :Enabled) - - device = UI.QueryWidget(Id("DHCP_HOSTNAME"), :Value) - - case device - when NONE_LABEL - LanItems.clear_set_hostname - - DNS.dhcp_hostname = false - when ANY_LABEL - LanItems.clear_set_hostname - - DNS.dhcp_hostname = true - when NO_CHANGE_LABEL - nil - else - LanItems.conf_set_hostname(device) - - DNS.dhcp_hostname = false - end + DNS.dhcp_hostname = UI.QueryWidget(Id("DHCP_HOSTNAME"), :Value) nil end From 3733dccd1e96d4dc627821dee96e5d7a1ea0b23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 16:34:13 +0100 Subject: [PATCH 313/471] Write DNS configuration after ifcfg-* files --- src/lib/y2network/sysconfig/config_writer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 2dd789f77..b17927ee8 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -46,9 +46,9 @@ def write(config, old_config = nil) file.routes = find_routes_for(nil, config.routing.routes) file.save - write_dns_settings(config, old_config) write_interfaces(config.interfaces) write_connections(config.connections) + write_dns_settings(config, old_config) end private From 51ffebe533755d412eb9ff5f45b0c133c5250acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 4 Sep 2019 16:37:02 +0100 Subject: [PATCH 314/471] Do not crash when writing ethtool_options --- src/lib/y2network/sysconfig/connection_config_writers/base.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index ef6f6410e..4136f1f27 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -45,7 +45,9 @@ def write(conn) file.lladdr = conn.lladdress file.startmode = conn.startmode.to_s file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" - file.ethtool_options = conn.ethtool_options unless conn.ethtool_options.empty? + if conn.ethtool_options && !conn.ethtool_options.empty? + file.ethtool_options = conn.ethtool_options + end file.zone = conn.firewall_zone add_ips(conn) update_file(conn) From 5aae257e8593ec888ebc120ce79f2d3b95577749 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 09:25:38 +0200 Subject: [PATCH 315/471] read to config interfaces --- src/lib/y2network/autoinst/config_reader.rb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index 5fb242ad8..7a912222c 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -22,6 +22,7 @@ require "y2network/config" require "y2network/autoinst/routing_reader" require "y2network/autoinst/dns_reader" +require "y2network/autoinst/interfaces_reader" require "y2network/autoinst_profile/networking_section" require "y2network/sysconfig/interfaces_reader" @@ -44,12 +45,19 @@ def initialize(section) # @return [Y2Network::Config] Network configuration def config attrs = { source: :sysconfig } - # FIXME: implement proper readers for AutoYaST - attrs[:interfaces] = interfaces_reader.interfaces - attrs[:connections] = interfaces_reader.connections + # How it works? For autoyast it reads current config and apply autoyast on top of it + attrs[:interfaces] = system_interfaces.interfaces + attrs[:connections] = system_interfaces.connections attrs[:routing] = RoutingReader.new(section.routing).config if section.routing attrs[:dns] = DNSReader.new(section.dns).config if section.dns - Y2Network::Config.new(attrs) + config = Y2Network::Config.new(attrs) + interfaces = InterfacesReader.new(section.interfaces).config + intefaces.each do |interface| + # add or update system configuration, this will also create all missing interfaces + config.add_or_update_connection_config(interface) + end + + config end private @@ -57,8 +65,8 @@ def config # Returns an interfaces reader instance # # @return [SysconfigInterfaces] Interfaces reader - def interfaces_reader - @interfaces_reader ||= Y2Network::Sysconfig::InterfacesReader.new + def system_interfaces + @system_interfaces ||= Y2Network::Sysconfig::InterfacesReader.new end end end From edc552418a590244c0e3be775814633f065b46b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 08:54:40 +0100 Subject: [PATCH 316/471] Update from code review --- src/lib/y2network/sysconfig/dns_reader.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/dns_reader.rb b/src/lib/y2network/sysconfig/dns_reader.rb index f91ff60f9..a36e1f7db 100644 --- a/src/lib/y2network/sysconfig/dns_reader.rb +++ b/src/lib/y2network/sysconfig/dns_reader.rb @@ -133,8 +133,10 @@ def dhcp_hostname value = Yast::SCR.Read(Yast::Path.new(".sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME")) return :any if value == "yes" files = InterfaceFile.all - files.each(&:load) - file = files.find { |f| f.dhclient_set_hostname == "yes" } + file = files.find do |f| + f.load + f.dhclient_set_hostname == "yes" + end file ? file.interface : :none end end From 33b5da1ad0413e16ab4aedd96bf9ac85b86efcf3 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 10:49:07 +0200 Subject: [PATCH 317/471] add initial test and fix issues found in it --- .../autoinst_profile/interface_section.rb | 4 +- .../interface_section_test.rb | 60 +++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 test/y2network/autoinst_profile/interface_section_test.rb diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb index 46defd04d..c693fa5ce 100644 --- a/src/lib/y2network/autoinst_profile/interface_section.rb +++ b/src/lib/y2network/autoinst_profile/interface_section.rb @@ -242,7 +242,7 @@ def initialize(*_args) self.class.attributes.each do |attr| # init everything to empty string - self.public.send(:"#{attr}=", "") + self.public_send(:"#{attr[:name]}=", "") end end @@ -257,7 +257,7 @@ def init_from_config(config) @ipaddr = config.ip.address.to_s @prefixlen = config.ip.address.address.to_s @remote_ipaddr = config.ip.remote_address.address.to_s if config.ip.remote_address - @broadcast = config.ip.broadcast.address.to_s + @broadcast = config.ip.broadcast.address.to_s if config.ip.broadcast end @startmode = config.startmode.name diff --git a/test/y2network/autoinst_profile/interface_section_test.rb b/test/y2network/autoinst_profile/interface_section_test.rb new file mode 100644 index 000000000..6c0d37e13 --- /dev/null +++ b/test/y2network/autoinst_profile/interface_section_test.rb @@ -0,0 +1,60 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/autoinst_profile/interface_section" +require "y2network/connection_config/ip_config" + +describe Y2Network::AutoinstProfile::InterfaceSection do + subject(:section) { described_class.new } + + describe ".new_from_network" do + let(:config) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |c| + c.bootproto = Y2Network::BootProtocol::STATIC + c.startmode = Y2Network::Startmode.create("ifplugd") + c.startmode.priority = 50 + c.firewall_zone = "DMZ" + c.ethtool_options = "test=1" + c.interface = "eth0" + c.ip = Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.new("10.100.0.1/24")) + end + end + + it "initializes the boot protocol value" do + section = described_class.new_from_network(config) + expect(section.bootproto).to eq("static") + end + end + + describe ".new_from_hashes" do + let(:hash) do + { + "bootproto" => "dhcp4", + "device" => "eth0", + "startmode" => "auto" + } + end + + it "loads properly boot protocol" do + section = described_class.new_from_hashes(hash) + expect(section.bootproto).to eq "dhcp4" + end + end +end From c1035dd4689af890249df63b884508eda7e80d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 10:05:32 +0100 Subject: [PATCH 318/471] Set default value for resolv_conf_policy element --- src/lib/y2network/autoinst/dns_reader.rb | 7 +++++-- test/y2network/autoinst/dns_reader_test.rb | 24 ++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/autoinst/dns_reader.rb b/src/lib/y2network/autoinst/dns_reader.rb index bf102692c..4e2333d47 100644 --- a/src/lib/y2network/autoinst/dns_reader.rb +++ b/src/lib/y2network/autoinst/dns_reader.rb @@ -40,9 +40,9 @@ def initialize(section) def config Y2Network::DNS.new( dhcp_hostname: section.dhcp_hostname, - hostname: section.hostname, + hostname: section.hostname || default_hostname, nameservers: valid_ips(section.nameservers), - resolv_conf_policy: section.resolv_conf_policy, + resolv_conf_policy: section.resolv_conf_policy || "auto", searchlist: section.searchlist ) end @@ -60,6 +60,9 @@ def valid_ips(ips) all << IPAddr.new(ip_str) if Yast::IP.Check(ip_str) end end + + def default_hostname + end end end end diff --git a/test/y2network/autoinst/dns_reader_test.rb b/test/y2network/autoinst/dns_reader_test.rb index 0db431666..087efa2bc 100644 --- a/test/y2network/autoinst/dns_reader_test.rb +++ b/test/y2network/autoinst/dns_reader_test.rb @@ -25,28 +25,44 @@ describe Y2Network::Autoinst::DNSReader do subject { described_class.new(dns_section) } + let(:dns_section) do Y2Network::AutoinstProfile::DNSSection.new_from_hashes(dns_profile) end - let(:forwarding_profile) { { "ip_forward" => true } } - let(:dhcp_hostname) { true } let(:dns_profile) do { "hostname" => "linux.example.org", "nameservers" => ["192.168.122.1", "10.0.0.1"], "searchlist" => ["suse.com"], - "resolv_conf_policy" => "auto" + "resolv_conf_policy" => "some-policy" } end describe "#config" do + EMPTY_DNS_SECTION = Y2Network::AutoinstProfile::DNSSection.new_from_hashes({}) + it "builds a new Y2Network::DNS config from the profile" do expect(subject.config).to be_a Y2Network::DNS expect(subject.config.hostname).to eq("linux.example.org") - expect(subject.config.resolv_conf_policy).to eq("auto") + expect(subject.config.resolv_conf_policy).to eq("some-policy") expect(subject.config.nameservers.size).to eq(2) end + + it "falls back to 'auto' for resolv_conf_policy" do + config = described_class.new(EMPTY_DNS_SECTION).config + expect(config.resolv_conf_policy).to eq("auto") + end + + it "falls back to an empty array for the name servers" do + config = described_class.new(EMPTY_DNS_SECTION).config + expect(config.nameservers).to eq([]) + end + + it "falls back to an empty array for the search list" do + config = described_class.new(EMPTY_DNS_SECTION).config + expect(config.searchlist).to eq([]) + end end end From 3e1d75a1ba1d47c352c215516dfaad46194d52ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 12:00:54 +0100 Subject: [PATCH 319/471] Move hostname reading logic to a separate class --- src/lib/y2network/hostname_reader.rb | 79 +++++++++++++++++++ src/lib/y2network/sysconfig/dns_reader.rb | 42 +--------- test/y2network/hostname_reader_test.rb | 86 +++++++++++++++++++++ test/y2network/sysconfig/dns_reader_test.rb | 57 +------------- 4 files changed, 169 insertions(+), 95 deletions(-) create mode 100644 src/lib/y2network/hostname_reader.rb create mode 100644 test/y2network/hostname_reader_test.rb diff --git a/src/lib/y2network/hostname_reader.rb b/src/lib/y2network/hostname_reader.rb new file mode 100644 index 000000000..1038adfee --- /dev/null +++ b/src/lib/y2network/hostname_reader.rb @@ -0,0 +1,79 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" + +Yast.import "FileUtils" +Yast.import "Hostname" +Yast.import "IP" +Yast.import "Mode" +Yast.import "NetHwDetection" + +module Y2Network + # This class is responsible for reading the hostname + # + # Depending on different circunstamces, the hostname can be read from different places (from a + # simple call to `/bin/hostname` to the `/etc/install.inf` during installation). + # + # @example Read hostname + # Y2Network::HostnameReader.new.hostname #=> "foo" + class HostnameReader + include Yast::Logger + + # Returns the hostname + # + # @return [String] + def hostname + if (Yast::Mode.installation || Yast::Mode.autoinst) && Yast::FileUtils.Exists("/etc/install.inf") + fqdn = hostname_from_install_inf + end + + return hostname_from_system if fqdn.nil? || fqdn.empty? + host, _domain = *Yast::Hostname.SplitFQ(fqdn) + host + end + + # Reads the hostname from the /etc/install.inf file + # + # @return [String] Hostname + def hostname_from_install_inf + install_inf_hostname = Yast::SCR.Read(Yast::Path.new(".etc.install_inf.Hostname")) || "" + log.info("Got #{install_inf_hostname} from install.inf") + + return "" if install_inf_hostname.empty? + + # if the name is actually IP, try to resolve it (bnc#556613, bnc#435649) + if Yast::IP.Check(install_inf_hostname) + fqdn = Yast::NetHwDetection.ResolveIP(install_inf_hostname) + log.info("Got #{fqdn} after resolving IP from install.inf") + else + fqdn = install_inf_hostname + end + + fqdn + end + + # Reads the hostname from the underlying system + # + # @return [String] Hostname + def hostname_from_system + Yast::Execute.stdout.on_target!("/bin/hostname").strip + end + end +end diff --git a/src/lib/y2network/sysconfig/dns_reader.rb b/src/lib/y2network/sysconfig/dns_reader.rb index a36e1f7db..9cb161e11 100644 --- a/src/lib/y2network/sysconfig/dns_reader.rb +++ b/src/lib/y2network/sysconfig/dns_reader.rb @@ -19,12 +19,7 @@ require "yast" require "y2network/dns" require "y2network/sysconfig/interface_file" - -Yast.import "Hostname" -Yast.import "Mode" -Yast.import "IP" -Yast.import "FileUtils" -Yast.import "NetHwDetection" +require "y2network/hostname_reader" module Y2Network module Sysconfig @@ -80,40 +75,7 @@ def resolv_conf_policy # # @return [String] def hostname - if (Yast::Mode.installation || Yast::Mode.autoinst) && Yast::FileUtils.Exists("/etc/install.inf") - fqdn = hostname_from_install_inf - end - - return hostname_from_system if fqdn.nil? || fqdn.empty? - host, _domain = *Yast::Hostname.SplitFQ(fqdn) - host - end - - # Reads the hostname from the /etc/install.inf file - # - # @return [String] Hostname - def hostname_from_install_inf - install_inf_hostname = Yast::SCR.Read(Yast::Path.new(".etc.install_inf.Hostname")) || "" - log.info("Got #{install_inf_hostname} from install.inf") - - return "" if install_inf_hostname.empty? - - # if the name is actually IP, try to resolve it (bnc#556613, bnc#435649) - if Yast::IP.Check(install_inf_hostname) - fqdn = Yast::NetHwDetection.ResolveIP(install_inf_hostname) - log.info("Got #{fqdn} after resolving IP from install.inf") - else - fqdn = install_inf_hostname - end - - fqdn - end - - # Reads the hostname from the underlying system - # - # @return [String] Hostname - def hostname_from_system - Yast::Execute.stdout.on_target!("/bin/hostname").strip + HostnameReader.new.hostname end # Return the list of search domains diff --git a/test/y2network/hostname_reader_test.rb b/test/y2network/hostname_reader_test.rb new file mode 100644 index 000000000..96e807b95 --- /dev/null +++ b/test/y2network/hostname_reader_test.rb @@ -0,0 +1,86 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" +require "y2network/hostname_reader" + +describe Y2Network::HostnameReader do + subject(:reader) { described_class.new } + + describe "#hostname" do + let(:executor) do + double("Yast::Execute", on_target!: "") + end + + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + end + + it "returns the hostname" do + expect(executor).to receive(:on_target!).with(/hostname/).and_return("foo") + expect(reader.hostname).to eq("foo") + end + + context "during installation" do + before do + allow(Yast::Mode).to receive(:installation).and_return(true) + allow(Yast::FileUtils).to receive(:Exists).with("/etc/install.inf") + .and_return(install_inf_exists) + allow(Yast::SCR).to receive(:Read).and_return(hostname) + allow(executor).to receive(:on_target!).with(/hostname/).and_return("foo") + end + + let(:hostname) { "linuxrc.example.net" } + let(:install_inf_exists) { true } + + it "reads the hostname from /etc/install.conf" do + expect(reader.hostname).to eq("linuxrc") + end + + context "and the hostname from /etc/install.conf is an IP address" do + let(:hostname) { "192.168.122.1" } + + before do + allow(Yast::NetHwDetection).to receive(:ResolveIP).with(hostname) + .and_return("router") + end + + it "returns the name for the address" do + expect(reader.hostname).to eq("router") + end + end + + context "and the hostname is not defined in /etc/install.conf" do + let(:hostname) { nil } + + it "reads the hostname from the system" do + expect(reader.hostname).to eq("foo") + end + end + + context "and the /etc/install.inf file does not exists" do + let(:install_inf_exists) { false } + + it "reads the hostname from the system" do + expect(reader.hostname).to eq("foo") + end + end + end + end +end diff --git a/test/y2network/sysconfig/dns_reader_test.rb b/test/y2network/sysconfig/dns_reader_test.rb index bc213dbd0..1a83c5b91 100644 --- a/test/y2network/sysconfig/dns_reader_test.rb +++ b/test/y2network/sysconfig/dns_reader_test.rb @@ -39,9 +39,7 @@ { "config" => netconfig_dns, "dhcp" => netconfig_dhcp } end - let(:executor) do - double("Yast::Execute", on_target!: "") - end + let(:hostname_reader) { instance_double(Y2Network::HostnameReader, hostname: "foo") } let(:ifcfg_eth0) do instance_double( @@ -55,7 +53,7 @@ key_parts = arg.to_s.split(".") netconfig.dig(*key_parts[3..-1]) end - allow(Yast::Execute).to receive(:stdout).and_return(executor) + allow(Y2Network::HostnameReader).to receive(:new).and_return(hostname_reader) allow(Y2Network::Sysconfig::InterfaceFile).to receive(:all).and_return([ifcfg_eth0]) end @@ -65,61 +63,10 @@ end it "includes the hostname" do - expect(executor).to receive(:on_target!).with(/hostname/).and_return("foo") config = reader.config expect(config.hostname).to eq("foo") end - context "during installation" do - before do - allow(Yast::Mode).to receive(:installation).and_return(true) - allow(Yast::FileUtils).to receive(:Exists).with("/etc/install.inf") - .and_return(install_inf_exists) - allow(Yast::SCR).to receive(:Read).and_return(hostname) - allow(executor).to receive(:on_target!).with(/hostname/).and_return("foo") - end - - let(:hostname) { "linuxrc.example.net" } - let(:install_inf_exists) { true } - - it "reads the hostname from /etc/install.conf" do - config = reader.config - expect(config.hostname).to eq("linuxrc") - end - - context "and the hostname from /etc/install.conf is an IP address" do - let(:hostname) { "192.168.122.1" } - - before do - allow(Yast::NetHwDetection).to receive(:ResolveIP).with(hostname) - .and_return("router") - end - - it "returns the name for the address" do - config = reader.config - expect(config.hostname).to eq("router") - end - end - - context "and the hostname is not defined in /etc/install.conf" do - let(:hostname) { nil } - - it "reads the hostname from the system" do - config = reader.config - expect(config.hostname).to eq("foo") - end - end - - context "and the /etc/install.inf file does not exists" do - let(:install_inf_exists) { false } - - it "reads the hostname from the system" do - config = reader.config - expect(config.hostname).to eq("foo") - end - end - end - it "includes the list of name servers" do config = reader.config expect(config.nameservers).to eq([IPAddr.new("1.1.1.1"), IPAddr.new("2.2.2.2")]) From 41f288e122765bae91c00933d0c5ccb0e0a1004d Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 13:29:51 +0200 Subject: [PATCH 320/471] add initial interfaces reader test --- .../y2network/autoinst/interfaces_reader.rb | 2 +- .../autoinst_profile/interfaces_section.rb | 2 +- .../autoinst/interfaces_reader_test.rb | 49 +++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 test/y2network/autoinst/interfaces_reader_test.rb diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index 1bdabcc2d..b184f2c37 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -54,7 +54,7 @@ def config def create_config(interface_section) # TODO: autoyast backend for type detector? # TODO: TUN/TAP interface missing for autoyast? - return ConnectionConfig::Bonding.new if interface_section.bonding.slave0 && !interface_section.bonding.slave0.empty? + return ConnectionConfig::Bonding.new if interface_section.bonding_slave0 && !interface_section.bonding_slave0.empty? return ConnectionConfig::Bridge.new if interface_section.bridge_ports && !interface_section.bridge_ports.empty? return ConnectionConfig::Vlan.new if interface_section.etherdevice && !interface_section.etherdevice.empty? return ConnectionConfig::Wireless.new if interface_section.wireless_essid && !interface_section.wireless_essid.empty? diff --git a/src/lib/y2network/autoinst_profile/interfaces_section.rb b/src/lib/y2network/autoinst_profile/interfaces_section.rb index f8e3e6f63..38a78f7c3 100644 --- a/src/lib/y2network/autoinst_profile/interfaces_section.rb +++ b/src/lib/y2network/autoinst_profile/interfaces_section.rb @@ -78,7 +78,7 @@ def initialize(*_args) # @param hash [Hash] see {.new_from_hashes} def init_from_hashes(hash) super - @interfaces = connection_configs_from_hash(hash) + @interfaces = interfaces_from_hash(hash) end # Method used by {.new_from_network} to populate the attributes when cloning routing settings diff --git a/test/y2network/autoinst/interfaces_reader_test.rb b/test/y2network/autoinst/interfaces_reader_test.rb new file mode 100644 index 000000000..d5770939d --- /dev/null +++ b/test/y2network/autoinst/interfaces_reader_test.rb @@ -0,0 +1,49 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/autoinst_profile/interfaces_section" +require "y2network/autoinst/interfaces_reader" +require "y2network/interface" + +describe Y2Network::Autoinst::InterfacesReader do + let(:subject) { described_class.new(interfaces_section) } + let(:interfaces_section) do + Y2Network::AutoinstProfile::InterfacesSection.new_from_hashes(interfaces_profile) + end + + let(:interfaces_profile) do + { + "interfaces" => [ + "bootproto" => "dhcp", + "name" => "eth0", + "startmode" => "auto" + ] + } + end + + describe "#config" do + it "builds a new Y2Network::ConnectionConfigsCollection" do + expect(subject.config).to be_a Y2Network::ConnectionConfigsCollection + expect(subject.config.size).to eq(1) + end + end +end From b271371a1885134c1900698e3af12538b158885e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 13:40:10 +0200 Subject: [PATCH 321/471] export interfaces in new way --- src/modules/Lan.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 30b89d39e..42746002f 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -777,7 +777,7 @@ def Export ), "net-udev" => Ops.get_map(udev_rules, "net-udev", {}), "config" => NetworkConfig.Export, - "devices" => devices, + "devices" => profile.interfaces.to_hashes, "ipv6" => @ipv6, "routing" => profile.routing ? profile.routing.to_hashes : {}, "managed" => NetworkService.is_network_manager, From 50b3168b41eb9d122f9fbea9debf768b9b589b44 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 13:42:44 +0200 Subject: [PATCH 322/471] fix from review --- src/lib/y2network/autoinst/interfaces_reader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index b184f2c37..423e32db2 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -24,7 +24,7 @@ module Y2Network module Autoinst - # This class is responsible of importing the AutoYast dns section + # This class is responsible of importing the AutoYast interfaces section class InterfacesReader # @return [AutoinstProfile::InterfacesSection] attr_reader :section From 28024683f5a69ae77cc71f669c41991e41757019 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 14:34:27 +0200 Subject: [PATCH 323/471] fix exporting --- src/lib/y2network/autoinst_profile/networking_section.rb | 2 +- src/modules/Lan.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/autoinst_profile/networking_section.rb b/src/lib/y2network/autoinst_profile/networking_section.rb index 960de569a..022f7744a 100644 --- a/src/lib/y2network/autoinst_profile/networking_section.rb +++ b/src/lib/y2network/autoinst_profile/networking_section.rb @@ -61,7 +61,7 @@ def self.new_from_network(config) return result unless config result.routing = RoutingSection.new_from_network(config.routing) if config.routing result.dns = DNSSection.new_from_network(config.dns) if config.dns - result.interfaces = InterfacesSection.new_from_network(config.connections) if config.dns + result.interfaces = InterfacesSection.new_from_network(config.connections) result end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 42746002f..986390f24 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -777,7 +777,7 @@ def Export ), "net-udev" => Ops.get_map(udev_rules, "net-udev", {}), "config" => NetworkConfig.Export, - "devices" => profile.interfaces.to_hashes, + "devices" => profile.interfaces ? profile.interfaces.to_hashes : {}, "ipv6" => @ipv6, "routing" => profile.routing ? profile.routing.to_hashes : {}, "managed" => NetworkService.is_network_manager, From 9f9583a96a4b2d4ac5e3cf9f185e8360eddf3178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 14:06:51 +0100 Subject: [PATCH 324/471] Move logic to propose a random hostname to the HostnameReader class --- src/lib/y2network/dns.rb | 9 +- src/lib/y2network/hostname_reader.rb | 31 +++++-- test/y2network/hostname_reader_test.rb | 121 +++++++++++++++++++------ 3 files changed, 120 insertions(+), 41 deletions(-) diff --git a/src/lib/y2network/dns.rb b/src/lib/y2network/dns.rb index 02840fc55..b228b35f8 100644 --- a/src/lib/y2network/dns.rb +++ b/src/lib/y2network/dns.rb @@ -17,6 +17,8 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "y2network/hostname_reader" + module Y2Network # DNS configuration (hostname, nameservers, etc.). class DNS @@ -53,15 +55,10 @@ def initialize(opts = {}) @dhcp_hostname = opts[:dhcp_hostname] end - # @return [Array] Valid chars to be used in the random part of a hostname - HOSTNAME_CHARS = (("a".."z").to_a + ("0".."9").to_a).freeze - private_constant :HOSTNAME_CHARS - # Sets a hostname is none is present def ensure_hostname! return unless @hostname.nil? || @hostname.empty? - suffix = HOSTNAME_CHARS.sample(4).join - @hostname = "linux-#{suffix}" + @hostname = HostnameReader.new.random_hostname end # @return [Array] Methods to check when comparing two instances diff --git a/src/lib/y2network/hostname_reader.rb b/src/lib/y2network/hostname_reader.rb index 1038adfee..d0b97c076 100644 --- a/src/lib/y2network/hostname_reader.rb +++ b/src/lib/y2network/hostname_reader.rb @@ -38,25 +38,25 @@ class HostnameReader # Returns the hostname # + # @note If the hostname cannot be determined, generate a random one. + # # @return [String] def hostname if (Yast::Mode.installation || Yast::Mode.autoinst) && Yast::FileUtils.Exists("/etc/install.inf") fqdn = hostname_from_install_inf end - return hostname_from_system if fqdn.nil? || fqdn.empty? - host, _domain = *Yast::Hostname.SplitFQ(fqdn) - host + fqdn || hostname_from_system || random_hostname end # Reads the hostname from the /etc/install.inf file # - # @return [String] Hostname + # @return [String,nil] Hostname def hostname_from_install_inf install_inf_hostname = Yast::SCR.Read(Yast::Path.new(".etc.install_inf.Hostname")) || "" log.info("Got #{install_inf_hostname} from install.inf") - return "" if install_inf_hostname.empty? + return nil if install_inf_hostname.empty? # if the name is actually IP, try to resolve it (bnc#556613, bnc#435649) if Yast::IP.Check(install_inf_hostname) @@ -66,14 +66,31 @@ def hostname_from_install_inf fqdn = install_inf_hostname end - fqdn + host, _domain = *Yast::Hostname.SplitFQ(fqdn) + host.empty? ? nil : host end # Reads the hostname from the underlying system # # @return [String] Hostname def hostname_from_system - Yast::Execute.stdout.on_target!("/bin/hostname").strip + Yast::Execute.stdout.on_target!("/bin/hostname", "--fqdn") + rescue Cheetah::ExecutionFailed + nil + end + + # @return [Array] Valid chars to be used in the random part of a hostname + HOSTNAME_CHARS = (("a".."z").to_a + ("0".."9").to_a).freeze + private_constant :HOSTNAME_CHARS + + # Returns a random hostname + # + # The idea is to use a name like this as fallback. + # + # @return [String] + def random_hostname + suffix = HOSTNAME_CHARS.sample(4).join + "linux-#{suffix}" end end end diff --git a/test/y2network/hostname_reader_test.rb b/test/y2network/hostname_reader_test.rb index 96e807b95..6a4fc5445 100644 --- a/test/y2network/hostname_reader_test.rb +++ b/test/y2network/hostname_reader_test.rb @@ -24,63 +24,128 @@ subject(:reader) { described_class.new } describe "#hostname" do - let(:executor) do - double("Yast::Execute", on_target!: "") - end + let(:install_inf_hostname) { "linuxrc" } + let(:system_hostname) { "system" } before do - allow(Yast::Execute).to receive(:stdout).and_return(executor) + allow(reader).to receive(:hostname_from_install_inf).and_return(install_inf_hostname) + allow(reader).to receive(:hostname_from_system).and_return(system_hostname) + allow(reader).to receive(:random_hostname).and_return("linux-abcd") end - it "returns the hostname" do - expect(executor).to receive(:on_target!).with(/hostname/).and_return("foo") - expect(reader.hostname).to eq("foo") + it "returns the system's hostname" do + expect(reader.hostname).to eq("system") + end + + context "when the hostname cannot be determined" do + let(:system_hostname) { nil } + + it "returns a random one" do + expect(reader.hostname).to eq("linux-abcd") + end end context "during installation" do + let(:install_inf_exists?) { true } + before do allow(Yast::Mode).to receive(:installation).and_return(true) allow(Yast::FileUtils).to receive(:Exists).with("/etc/install.inf") - .and_return(install_inf_exists) - allow(Yast::SCR).to receive(:Read).and_return(hostname) - allow(executor).to receive(:on_target!).with(/hostname/).and_return("foo") + .and_return(install_inf_exists?) end - let(:hostname) { "linuxrc.example.net" } - let(:install_inf_exists) { true } - it "reads the hostname from /etc/install.conf" do expect(reader.hostname).to eq("linuxrc") end - context "and the hostname from /etc/install.conf is an IP address" do - let(:hostname) { "192.168.122.1" } + context "when the /etc/install.inf file does not exists" do + let(:install_inf_exists?) { false } - before do - allow(Yast::NetHwDetection).to receive(:ResolveIP).with(hostname) - .and_return("router") + it "reads the hostname from the system" do + expect(reader.hostname).to eq("system") end + end + + context "when the hostname cannot be determined" do + let(:install_inf_hostname) { nil } + let(:system_hostname) { nil } - it "returns the name for the address" do - expect(reader.hostname).to eq("router") + it "returns a random one" do + expect(reader.hostname).to eq("linux-abcd") end end + end + end + + describe "#hostname_from_install_inf" do + let(:hostname) { "foo.bar.com" } + + before do + allow(Yast::SCR).to receive(:Read).and_return(hostname) + end + + it "returns the hostname (without the domain)" do + expect(reader.hostname_from_install_inf).to eq("foo") + end + + context "when the Hostname is not defined in the install.inf file" do + let(:hostname) { nil } + + it "returns nil" do + expect(reader.hostname_from_install_inf).to be_nil + end + end + + context "when an IP address is used instead of a hostname" do + let(:hostname) { "foo1.bar.cz" } - context "and the hostname is not defined in /etc/install.conf" do + before do + allow(Yast::NetHwDetection).to receive(:ResolveIP).and_return(hostname) + end + + it "returns the associated hostname" do + expect(reader.hostname_from_install_inf).to eq("foo1") + end + + context "and it is not resolvable to an IP" do let(:hostname) { nil } - it "reads the hostname from the system" do - expect(reader.hostname).to eq("foo") + it "returns nil" do + expect(reader.hostname_from_install_inf).to be_nil end end + end + end - context "and the /etc/install.inf file does not exists" do - let(:install_inf_exists) { false } + describe "#hostname_from_system" do + let(:executor) do + double("Yast::Execute", on_target!: "foo") + end - it "reads the hostname from the system" do - expect(reader.hostname).to eq("foo") - end + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + end + + it "returns the systems' hostname" do + expect(executor).to receive(:on_target!).with("/bin/hostname", "--fqdn").and_return("foo") + expect(reader.hostname_from_system).to eq("foo") + end + + context "when the hostname cannot be determined" do + before do + allow(executor).to receive(:on_target!).with("/bin/hostname", "--fqdn") + .and_raise(Cheetah::ExecutionFailed.new([], "", nil, nil)) + end + + it "returns nil" do + expect(reader.hostname_from_system).to be_nil end end end + + describe "#random_hostname" do + it "returns a random name" do + expect(reader.random_hostname).to match(/linux-\w{4}/) + end + end end From 50e9efa0fb3e6e32d2e2c08651fed7afba669bd9 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 15:21:59 +0200 Subject: [PATCH 325/471] add client for testing export and also fix found issues --- src/clients/lan_export.rb | 48 +++++++++++++++++++ .../autoinst_profile/interface_section.rb | 2 +- .../autoinst_profile/networking_section.rb | 3 +- .../connection_config_writers/base.rb | 2 +- 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 src/clients/lan_export.rb diff --git a/src/clients/lan_export.rb b/src/clients/lan_export.rb new file mode 100644 index 000000000..c36c39970 --- /dev/null +++ b/src/clients/lan_export.rb @@ -0,0 +1,48 @@ +# encoding: utf-8 + +# *************************************************************************** +# +# Copyright (c) 2012 Novell, Inc. +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +# +# ************************************************************************** + +require "yaml" + +module Yast + # Client for testing autoyast export and writes result to /tmp/test.yaml + # DEVELOPMENT ONLY, not for production use + class LanExportClient < Client + def main + Yast.import "UI" + + textdomain "network" + + # Open Trivial UI to get error messages + Yast::UI.OpenDialog(Yast::Term.new(:PushButton, "Test")) + WFM.CallFunction("lan_auto", ["Read"]) + res = WFM.CallFunction("lan_auto", ["Export"]) + File.write("/tmp/test.yaml", res.to_yaml) + Yast::UI.CloseDialog + + nil + end + end +end + +Yast::LanExportClient.new.main diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb index c693fa5ce..1d391a87f 100644 --- a/src/lib/y2network/autoinst_profile/interface_section.rb +++ b/src/lib/y2network/autoinst_profile/interface_section.rb @@ -253,7 +253,7 @@ def initialize(*_args) def init_from_config(config) @bootproto = config.bootproto.name @name = config.name - if config.bootproto == BootProtocol::STATIC + if config.bootproto == BootProtocol::STATIC && config.ip @ipaddr = config.ip.address.to_s @prefixlen = config.ip.address.address.to_s @remote_ipaddr = config.ip.remote_address.address.to_s if config.ip.remote_address diff --git a/src/lib/y2network/autoinst_profile/networking_section.rb b/src/lib/y2network/autoinst_profile/networking_section.rb index 022f7744a..92d48e626 100644 --- a/src/lib/y2network/autoinst_profile/networking_section.rb +++ b/src/lib/y2network/autoinst_profile/networking_section.rb @@ -17,8 +17,9 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/autoinst_profile/routing_section" require "y2network/autoinst_profile/dns_section" +require "y2network/autoinst_profile/interfaces_section" +require "y2network/autoinst_profile/routing_section" module Y2Network module AutoinstProfile diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index ef6f6410e..53a621033 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -45,7 +45,7 @@ def write(conn) file.lladdr = conn.lladdress file.startmode = conn.startmode.to_s file.ifplugd_priority = conn.startmode.priority if conn.startmode.name == "ifplugd" - file.ethtool_options = conn.ethtool_options unless conn.ethtool_options.empty? + file.ethtool_options = conn.ethtool_options if conn.ethtool_options && !conn.ethtool_options.empty? file.zone = conn.firewall_zone add_ips(conn) update_file(conn) From 475bf754e148290b2849b77d4c1758c2c592213c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 5 Sep 2019 16:48:06 +0200 Subject: [PATCH 326/471] fixes to make happy test and also rubocop --- src/lib/y2network/autoinst/config_reader.rb | 10 +++++---- .../y2network/autoinst/interfaces_reader.rb | 22 ++++++++++++++++++- .../autoinst_profile/interface_section.rb | 4 ++-- .../autoinst_profile/interfaces_section.rb | 8 +++---- .../autoinst_profile/networking_section.rb | 6 ++--- .../autoinst/interfaces_reader_test.rb | 8 +++---- .../interface_section_test.rb | 6 ++--- 7 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index 7a912222c..702f97713 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -51,10 +51,12 @@ def config attrs[:routing] = RoutingReader.new(section.routing).config if section.routing attrs[:dns] = DNSReader.new(section.dns).config if section.dns config = Y2Network::Config.new(attrs) - interfaces = InterfacesReader.new(section.interfaces).config - intefaces.each do |interface| - # add or update system configuration, this will also create all missing interfaces - config.add_or_update_connection_config(interface) + if section.interfaces + interfaces = InterfacesReader.new(section.interfaces).config + interfaces.each do |interface| + # add or update system configuration, this will also create all missing interfaces + config.add_or_update_connection_config(interface) + end end config diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index 423e32db2..26bca7a74 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -43,7 +43,27 @@ def initialize(section) def config configs = @section.interfaces.map do |interface_section| config = create_config(interface_section) - # TODO: read it from section + config.bootproto = BootProtocol.from_name(interface_section.bootproto) + config.name = interface_section.name || interface_section.device # device is just fallback + if config.bootproto == BootProtocol::STATIC + # TODO: report if ipaddr missing for static config + ipaddr = IPAddress.from_string(interface_section.ipaddr) + # Assign first netmask, as prefixlen has precedence so it will overwrite it + ipaddr.netmask = interface_section.netmask if interface_section.netmask + ipaddr.prefix = interface_section.prefixlen.to_i if interface_section.prefixlen + broadcast = interface_section.broadcast && IPAddress.new(interface_section.broadcast) + remote = interface_section.remote_ipaddr && IPAddress.new(interface_section.remote_ipaddr) + config.ip = IPConfig.new(ipaddr, broadcast: broadcast, remote_address: remote) + end + + config.startmode = Startmode.create(interface_section.startmode) if interface_section.startmode + config.startmode.priority = interface_section.ifplugd_priority if config.startmode.name == "ifplugd" && interface_section.ifplugd_priority + config.mtu = interface_section.mtu.to_i if interface_section.mtu + config.ethtool_options = interface_section.ethtool_options if interface_section.ethtool_options + config.firewall_zone = interface_section.zone if interface_section.zone + + # TODO: type specific configs + config end ConnectionConfigsCollection.new(configs) diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb index 1d391a87f..5f07952f7 100644 --- a/src/lib/y2network/autoinst_profile/interface_section.rb +++ b/src/lib/y2network/autoinst_profile/interface_section.rb @@ -229,7 +229,7 @@ def self.attributes # Clones a network interface into an AutoYaST interface section # - # @param route [Y2Network::ConnectionConfig] Network connection config + # @param connection_config [Y2Network::ConnectionConfig] Network connection config # @return [InterfacesSection] def self.new_from_network(connection_config) result = new @@ -242,7 +242,7 @@ def initialize(*_args) self.class.attributes.each do |attr| # init everything to empty string - self.public_send(:"#{attr[:name]}=", "") + public_send(:"#{attr[:name]}=", "") end end diff --git a/src/lib/y2network/autoinst_profile/interfaces_section.rb b/src/lib/y2network/autoinst_profile/interfaces_section.rb index 38a78f7c3..fd995e6c2 100644 --- a/src/lib/y2network/autoinst_profile/interfaces_section.rb +++ b/src/lib/y2network/autoinst_profile/interfaces_section.rb @@ -59,7 +59,7 @@ def self.attributes # Clones network interfaces settings into an AutoYaST interfaces section # - # @param routing [Y2Network::Config] whole config as it need both interfaces and connection configs + # @param config [Y2Network::Config] whole config as it need both interfaces and connection configs # @return [InterfacesSection] def self.new_from_network(config) result = new @@ -75,9 +75,8 @@ def initialize(*_args) # Method used by {.new_from_hashes} to populate the attributes when importing a profile # - # @param hash [Hash] see {.new_from_hashes} + # @param hash [Array] see {.new_from_hashes}. In this case it is array of interfaces def init_from_hashes(hash) - super @interfaces = interfaces_from_hash(hash) end @@ -96,8 +95,7 @@ def init_from_network(connection_configs) # # @param hash [Hash] Interfaces section hash def interfaces_from_hash(hash) - hashes = hash["interfaces"] || [] - hashes.map { |h| InterfaceSection.new_from_hashes(h) } + hash.map { |h| InterfaceSection.new_from_hashes(h) } end def interfaces_section(connection_configs) diff --git a/src/lib/y2network/autoinst_profile/networking_section.rb b/src/lib/y2network/autoinst_profile/networking_section.rb index 92d48e626..dcef6bc63 100644 --- a/src/lib/y2network/autoinst_profile/networking_section.rb +++ b/src/lib/y2network/autoinst_profile/networking_section.rb @@ -71,9 +71,9 @@ def self.new_from_network(config) # @return [Hash] def to_hashes { - "routing" => routing.to_hashes, - "dns" => dns.to_hashes, - "interfaces" => interfaces.to_hashes, + "routing" => routing.to_hashes, + "dns" => dns.to_hashes, + "interfaces" => interfaces.to_hashes } end end diff --git a/test/y2network/autoinst/interfaces_reader_test.rb b/test/y2network/autoinst/interfaces_reader_test.rb index d5770939d..c11f30625 100644 --- a/test/y2network/autoinst/interfaces_reader_test.rb +++ b/test/y2network/autoinst/interfaces_reader_test.rb @@ -31,13 +31,13 @@ end let(:interfaces_profile) do - { - "interfaces" => [ + [ + { "bootproto" => "dhcp", "name" => "eth0", "startmode" => "auto" - ] - } + } + ] end describe "#config" do diff --git a/test/y2network/autoinst_profile/interface_section_test.rb b/test/y2network/autoinst_profile/interface_section_test.rb index 6c0d37e13..f8fe41a61 100644 --- a/test/y2network/autoinst_profile/interface_section_test.rb +++ b/test/y2network/autoinst_profile/interface_section_test.rb @@ -46,9 +46,9 @@ describe ".new_from_hashes" do let(:hash) do { - "bootproto" => "dhcp4", - "device" => "eth0", - "startmode" => "auto" + "bootproto" => "dhcp4", + "device" => "eth0", + "startmode" => "auto" } end From 4a48ad60b7d351b199b4780f322decf9f6fcb931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 15:12:21 +0100 Subject: [PATCH 327/471] Lazily propose a hostname when none is found --- src/lib/network/network_autoconfiguration.rb | 1 - src/lib/y2network/dns.rb | 6 ---- src/lib/y2network/hostname_reader.rb | 2 +- src/lib/y2network/sysconfig/dns_writer.rb | 1 - src/modules/DNS.rb | 7 ----- test/dns_test.rb | 7 ----- test/y2network/dns_test.rb | 29 -------------------- test/y2network/hostname_reader_test.rb | 13 ++------- test/y2network/sysconfig/dns_writer_test.rb | 9 ------ 9 files changed, 4 insertions(+), 71 deletions(-) diff --git a/src/lib/network/network_autoconfiguration.rb b/src/lib/network/network_autoconfiguration.rb index 22568c87d..aec794f48 100644 --- a/src/lib/network/network_autoconfiguration.rb +++ b/src/lib/network/network_autoconfiguration.rb @@ -110,7 +110,6 @@ def configure_virtuals # Propose DNS and Hostname setup def configure_dns DNS.Read # handles NetworkConfig too - DNS.propose_hostname log.info("NetworkAutoconfiguration: proposing DNS / Hostname configuration") DNS.Write end diff --git a/src/lib/y2network/dns.rb b/src/lib/y2network/dns.rb index b228b35f8..f48f3b96a 100644 --- a/src/lib/y2network/dns.rb +++ b/src/lib/y2network/dns.rb @@ -55,12 +55,6 @@ def initialize(opts = {}) @dhcp_hostname = opts[:dhcp_hostname] end - # Sets a hostname is none is present - def ensure_hostname! - return unless @hostname.nil? || @hostname.empty? - @hostname = HostnameReader.new.random_hostname - end - # @return [Array] Methods to check when comparing two instances ATTRS = [ :hostname, :nameservers, :searchlist, :resolv_conf_policy, :dhcp_hostname diff --git a/src/lib/y2network/hostname_reader.rb b/src/lib/y2network/hostname_reader.rb index d0b97c076..ea4afbc06 100644 --- a/src/lib/y2network/hostname_reader.rb +++ b/src/lib/y2network/hostname_reader.rb @@ -74,7 +74,7 @@ def hostname_from_install_inf # # @return [String] Hostname def hostname_from_system - Yast::Execute.stdout.on_target!("/bin/hostname", "--fqdn") + Yast::Execute.on_target!("/bin/hostname", "--fqdn", stdout: :capture) rescue Cheetah::ExecutionFailed nil end diff --git a/src/lib/y2network/sysconfig/dns_writer.rb b/src/lib/y2network/sysconfig/dns_writer.rb index 5f411fa74..7bad7e672 100644 --- a/src/lib/y2network/sysconfig/dns_writer.rb +++ b/src/lib/y2network/sysconfig/dns_writer.rb @@ -71,7 +71,6 @@ def update_sysconfig_dhcp(config, old_config) # # @param dns [Y2Network::DNS] DNS configuration def update_hostname(dns) - dns.ensure_hostname! Yast::Execute.on_target!("/bin/hostname", dns.hostname.split(".")[0]) Yast::SCR.Write(Yast::Path.new(".target.string"), HOSTNAME_PATH, "#{dns.hostname}\n") end diff --git a/src/modules/DNS.rb b/src/modules/DNS.rb index f86ee193a..0fee6e89b 100644 --- a/src/modules/DNS.rb +++ b/src/modules/DNS.rb @@ -218,13 +218,6 @@ def Write(_gui: true) true end - # Proposes hostname if none was given - # - # @see Y2Network::DNS#ensure_hostname! - def propose_hostname - yast_dns_config.ensure_hostname! - end - # Check if hostname or IP address is local computer # Used to determine if LDAP server is local (and it should be checked if # required schemes are included diff --git a/test/dns_test.rb b/test/dns_test.rb index bb3d9055a..3daa84f4d 100755 --- a/test/dns_test.rb +++ b/test/dns_test.rb @@ -212,11 +212,4 @@ end end end - - describe "#propose_hostname" do - it "proposes a hostname" do - expect(dns_config).to receive(:ensure_hostname!) - subject.propose_hostname - end - end end diff --git a/test/y2network/dns_test.rb b/test/y2network/dns_test.rb index 06b11d73e..ec05554b0 100644 --- a/test/y2network/dns_test.rb +++ b/test/y2network/dns_test.rb @@ -78,33 +78,4 @@ end end end - - describe "#ensure_hostname!" do - context "when no hostname was given" do - subject(:dns) { described_class.new } - - it "returns a random name" do - dns.ensure_hostname! - expect(dns.hostname).to match(/linux-\w{4}/) - end - end - - context "when an empty hostname was given" do - subject(:dns) { described_class.new(hostname: "") } - - it "returns a random name" do - dns.ensure_hostname! - expect(dns.hostname).to match(/linux-\w{4}/) - end - end - - context "when a hostname was given" do - subject(:dns) { described_class.new(hostname: "foo") } - - it "returns the given name" do - dns.ensure_hostname! - expect(dns.hostname).to eq("foo") - end - end - end end diff --git a/test/y2network/hostname_reader_test.rb b/test/y2network/hostname_reader_test.rb index 6a4fc5445..a0b6bc7eb 100644 --- a/test/y2network/hostname_reader_test.rb +++ b/test/y2network/hostname_reader_test.rb @@ -118,22 +118,15 @@ end describe "#hostname_from_system" do - let(:executor) do - double("Yast::Execute", on_target!: "foo") - end - - before do - allow(Yast::Execute).to receive(:stdout).and_return(executor) - end - it "returns the systems' hostname" do - expect(executor).to receive(:on_target!).with("/bin/hostname", "--fqdn").and_return("foo") + expect(Yast::Execute).to receive(:on_target!).with("/bin/hostname", "--fqdn", stdout: :capture) + .and_return("foo") expect(reader.hostname_from_system).to eq("foo") end context "when the hostname cannot be determined" do before do - allow(executor).to receive(:on_target!).with("/bin/hostname", "--fqdn") + allow(Yast::Execute).to receive(:on_target!).with("/bin/hostname", "--fqdn", stdout: :capture) .and_raise(Cheetah::ExecutionFailed.new([], "", nil, nil)) end diff --git a/test/y2network/sysconfig/dns_writer_test.rb b/test/y2network/sysconfig/dns_writer_test.rb index cb3151648..4e9e7337c 100644 --- a/test/y2network/sysconfig/dns_writer_test.rb +++ b/test/y2network/sysconfig/dns_writer_test.rb @@ -116,15 +116,6 @@ writer.write(dns, old_dns) end - context "when no hostname is given" do - let(:hostname) { nil } - - it "proposes a hostname" do - expect(Yast::Execute).to receive(:on_target!).with("/bin/hostname", /linux-/) - writer.write(dns, old_dns) - end - end - context "when sendmail update script is installed" do before do allow(Yast::FileUtils).to receive(:Exists).with(/sendmail/).and_return(true) From 89807a04bb20120707aeb435a15dee7496023c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 15:20:58 +0100 Subject: [PATCH 328/471] Check /etc/hostname when trying to get the hostname --- src/lib/y2network/hostname_reader.rb | 3 ++- test/y2network/hostname_reader_test.rb | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/hostname_reader.rb b/src/lib/y2network/hostname_reader.rb index ea4afbc06..ac10aa912 100644 --- a/src/lib/y2network/hostname_reader.rb +++ b/src/lib/y2network/hostname_reader.rb @@ -76,7 +76,8 @@ def hostname_from_install_inf def hostname_from_system Yast::Execute.on_target!("/bin/hostname", "--fqdn", stdout: :capture) rescue Cheetah::ExecutionFailed - nil + name = Yast::SCR.Read(Yast::Path.new(".target.string"), "/etc/hostname").to_s.strip + name.empty? ? nil : name end # @return [Array] Valid chars to be used in the random part of a hostname diff --git a/test/y2network/hostname_reader_test.rb b/test/y2network/hostname_reader_test.rb index a0b6bc7eb..8290da3b8 100644 --- a/test/y2network/hostname_reader_test.rb +++ b/test/y2network/hostname_reader_test.rb @@ -124,14 +124,26 @@ expect(reader.hostname_from_system).to eq("foo") end - context "when the hostname cannot be determined" do + context "when the fqdn cannot be determined" do + let(:hostname_content) { "bar\n" } + before do allow(Yast::Execute).to receive(:on_target!).with("/bin/hostname", "--fqdn", stdout: :capture) .and_raise(Cheetah::ExecutionFailed.new([], "", nil, nil)) + allow(Yast::SCR).to receive(:Read).with(Yast::Path.new(".target.string"), "/etc/hostname") + .and_return(hostname_content) end - it "returns nil" do - expect(reader.hostname_from_system).to be_nil + it "returns the name in /etc/hostname" do + expect(reader.hostname_from_system).to eq("bar") + end + + context "when the /etc/hostname file is empty" do + let(:hostname_content) { "\n" } + + it "returns nil" do + expect(reader.hostname_from_system).to be_nil + end end end end From 897b1fa61d65029026941cb414dfb5c97fd23c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 16:14:26 +0100 Subject: [PATCH 329/471] Drop unneeded import --- src/lib/y2network/interface.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 08c1fa376..97e35a718 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -19,7 +19,6 @@ require "yast" require "y2network/interface_type" -require "y2network/hwinfo" module Y2Network # Network interface. From 0c2d0ada23b6efa9d2c0d2649e9aec17d1ee79b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 5 Sep 2019 16:46:23 +0100 Subject: [PATCH 330/471] AutoYaST falls back to the current hostname --- src/lib/y2network/autoinst/dns_reader.rb | 5 +++++ test/y2network/autoinst/dns_reader_test.rb | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/lib/y2network/autoinst/dns_reader.rb b/src/lib/y2network/autoinst/dns_reader.rb index 4e2333d47..65d9d21c5 100644 --- a/src/lib/y2network/autoinst/dns_reader.rb +++ b/src/lib/y2network/autoinst/dns_reader.rb @@ -19,6 +19,7 @@ require "yast" require "y2network/dns" +require "y2network/hostname_reader" require "ipaddr" Yast.import "IP" @@ -61,7 +62,11 @@ def valid_ips(ips) end end + # Returns a random hostname + # + # @return [String] def default_hostname + HostnameReader.new.hostname end end end diff --git a/test/y2network/autoinst/dns_reader_test.rb b/test/y2network/autoinst/dns_reader_test.rb index 087efa2bc..8f2b32157 100644 --- a/test/y2network/autoinst/dns_reader_test.rb +++ b/test/y2network/autoinst/dns_reader_test.rb @@ -39,6 +39,11 @@ "resolv_conf_policy" => "some-policy" } end + let(:hostname_reader) { instance_double(Y2Network::HostnameReader, hostname: "foo") } + + before do + allow(Y2Network::HostnameReader).to receive(:new).and_return(hostname_reader) + end describe "#config" do EMPTY_DNS_SECTION = Y2Network::AutoinstProfile::DNSSection.new_from_hashes({}) @@ -50,6 +55,11 @@ expect(subject.config.nameservers.size).to eq(2) end + it "falls back to the current hostname" do + config = described_class.new(EMPTY_DNS_SECTION).config + expect(config.hostname).to eq("foo") + end + it "falls back to 'auto' for resolv_conf_policy" do config = described_class.new(EMPTY_DNS_SECTION).config expect(config.resolv_conf_policy).to eq("auto") From ca4dc09980d209899002dacc357612910342c9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 6 Sep 2019 07:48:22 +0100 Subject: [PATCH 331/471] Replace "/bin/hostname" with "/usr/bin/hostname" --- src/lib/y2network/hostname_reader.rb | 4 ++-- src/lib/y2network/sysconfig/dns_writer.rb | 2 +- src/modules/DNS.rb | 6 +++--- test/dns_test.rb | 6 +++--- test/y2network/hostname_reader_test.rb | 4 ++-- test/y2network/sysconfig/dns_writer_test.rb | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/y2network/hostname_reader.rb b/src/lib/y2network/hostname_reader.rb index ac10aa912..0f36af49c 100644 --- a/src/lib/y2network/hostname_reader.rb +++ b/src/lib/y2network/hostname_reader.rb @@ -29,7 +29,7 @@ module Y2Network # This class is responsible for reading the hostname # # Depending on different circunstamces, the hostname can be read from different places (from a - # simple call to `/bin/hostname` to the `/etc/install.inf` during installation). + # simple call to `/usr/bin/hostname` to the `/etc/install.inf` during installation). # # @example Read hostname # Y2Network::HostnameReader.new.hostname #=> "foo" @@ -74,7 +74,7 @@ def hostname_from_install_inf # # @return [String] Hostname def hostname_from_system - Yast::Execute.on_target!("/bin/hostname", "--fqdn", stdout: :capture) + Yast::Execute.on_target!("/usr/bin/hostname", "--fqdn", stdout: :capture) rescue Cheetah::ExecutionFailed name = Yast::SCR.Read(Yast::Path.new(".target.string"), "/etc/hostname").to_s.strip name.empty? ? nil : name diff --git a/src/lib/y2network/sysconfig/dns_writer.rb b/src/lib/y2network/sysconfig/dns_writer.rb index 7bad7e672..38b111563 100644 --- a/src/lib/y2network/sysconfig/dns_writer.rb +++ b/src/lib/y2network/sysconfig/dns_writer.rb @@ -71,7 +71,7 @@ def update_sysconfig_dhcp(config, old_config) # # @param dns [Y2Network::DNS] DNS configuration def update_hostname(dns) - Yast::Execute.on_target!("/bin/hostname", dns.hostname.split(".")[0]) + Yast::Execute.on_target!("/usr/bin/hostname", dns.hostname.split(".")[0]) Yast::SCR.Write(Yast::Path.new(".target.string"), HOSTNAME_PATH, "#{dns.hostname}\n") end diff --git a/src/modules/DNS.rb b/src/modules/DNS.rb index 0fee6e89b..4f1772bbb 100644 --- a/src/modules/DNS.rb +++ b/src/modules/DNS.rb @@ -291,9 +291,9 @@ def modified # @return [Hash] a map containing ip, hostname_short, and hostname_fq keys def dhcp_data { - "ip" => Yast::Execute.stdout.on_target!("/bin/hostname -i").strip, - "hostname_short" => Yast::Execute.stdout.on_target!("/bin/hostname").strip, - "hostname_fq" => Yast::Execute.stdout.on_target!("/bin/hostname -f").strip + "ip" => Yast::Execute.stdout.on_target!("/usr/bin/hostname -i").strip, + "hostname_short" => Yast::Execute.stdout.on_target!("/usr/bin/hostname").strip, + "hostname_fq" => Yast::Execute.stdout.on_target!("/usr/bin/hostname -f").strip } end diff --git a/test/dns_test.rb b/test/dns_test.rb index 3daa84f4d..1be60fa77 100755 --- a/test/dns_test.rb +++ b/test/dns_test.rb @@ -131,9 +131,9 @@ allow(Yast::IP).to receive(:Check4).and_return(ipv4) allow(Yast::IP).to receive(:Check6).and_return(ipv6) allow(Yast::Execute).to receive(:stdout).and_return(stdout) - allow(stdout).to receive(:on_target!).with("/bin/hostname -i").and_return(ip) - allow(stdout).to receive(:on_target!).with("/bin/hostname").and_return(hostname_short) - allow(stdout).to receive(:on_target!).with("/bin/hostname -f").and_return(hostname_fq) + allow(stdout).to receive(:on_target!).with("/usr/bin/hostname -i").and_return(ip) + allow(stdout).to receive(:on_target!).with("/usr/bin/hostname").and_return(hostname_short) + allow(stdout).to receive(:on_target!).with("/usr/bin/hostname -f").and_return(hostname_fq) subject.dhcp_hostname = true end diff --git a/test/y2network/hostname_reader_test.rb b/test/y2network/hostname_reader_test.rb index 8290da3b8..bf6b05097 100644 --- a/test/y2network/hostname_reader_test.rb +++ b/test/y2network/hostname_reader_test.rb @@ -119,7 +119,7 @@ describe "#hostname_from_system" do it "returns the systems' hostname" do - expect(Yast::Execute).to receive(:on_target!).with("/bin/hostname", "--fqdn", stdout: :capture) + expect(Yast::Execute).to receive(:on_target!).with("/usr/bin/hostname", "--fqdn", stdout: :capture) .and_return("foo") expect(reader.hostname_from_system).to eq("foo") end @@ -128,7 +128,7 @@ let(:hostname_content) { "bar\n" } before do - allow(Yast::Execute).to receive(:on_target!).with("/bin/hostname", "--fqdn", stdout: :capture) + allow(Yast::Execute).to receive(:on_target!).with("/usr/bin/hostname", "--fqdn", stdout: :capture) .and_raise(Cheetah::ExecutionFailed.new([], "", nil, nil)) allow(Yast::SCR).to receive(:Read).with(Yast::Path.new(".target.string"), "/etc/hostname") .and_return(hostname_content) diff --git a/test/y2network/sysconfig/dns_writer_test.rb b/test/y2network/sysconfig/dns_writer_test.rb index 4e9e7337c..e2aa8a82a 100644 --- a/test/y2network/sysconfig/dns_writer_test.rb +++ b/test/y2network/sysconfig/dns_writer_test.rb @@ -110,7 +110,7 @@ end it "updates the hostname" do - expect(Yast::Execute).to receive(:on_target!).with("/bin/hostname", "myhost") + expect(Yast::Execute).to receive(:on_target!).with("/usr/bin/hostname", "myhost") expect(Yast::SCR).to receive(:Write) .with(Yast::Path.new(".target.string"), "/etc/hostname", "myhost.example.net\n") writer.write(dns, old_dns) From 393de34dfd4832a8d7219bd16211cee4b2735730 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 6 Sep 2019 09:53:57 +0200 Subject: [PATCH 332/471] load backend specific interface keys --- .../y2network/autoinst/interfaces_reader.rb | 96 +++++++++++++++---- .../autoinst_profile/interface_section.rb | 4 +- 2 files changed, 81 insertions(+), 19 deletions(-) diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index 26bca7a74..19c2860fd 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -43,26 +43,20 @@ def initialize(section) def config configs = @section.interfaces.map do |interface_section| config = create_config(interface_section) - config.bootproto = BootProtocol.from_name(interface_section.bootproto) - config.name = interface_section.name || interface_section.device # device is just fallback - if config.bootproto == BootProtocol::STATIC - # TODO: report if ipaddr missing for static config - ipaddr = IPAddress.from_string(interface_section.ipaddr) - # Assign first netmask, as prefixlen has precedence so it will overwrite it - ipaddr.netmask = interface_section.netmask if interface_section.netmask - ipaddr.prefix = interface_section.prefixlen.to_i if interface_section.prefixlen - broadcast = interface_section.broadcast && IPAddress.new(interface_section.broadcast) - remote = interface_section.remote_ipaddr && IPAddress.new(interface_section.remote_ipaddr) - config.ip = IPConfig.new(ipaddr, broadcast: broadcast, remote_address: remote) - end + config.propose # propose reasonable defaults for not set attributes + load_generic(config, interface_section) - config.startmode = Startmode.create(interface_section.startmode) if interface_section.startmode - config.startmode.priority = interface_section.ifplugd_priority if config.startmode.name == "ifplugd" && interface_section.ifplugd_priority - config.mtu = interface_section.mtu.to_i if interface_section.mtu - config.ethtool_options = interface_section.ethtool_options if interface_section.ethtool_options - config.firewall_zone = interface_section.zone if interface_section.zone + case config + when ConnectionConfig::Vlan + load_vlan(config, interface_section) + when ConnectionConfig::Bridge + load_bridge(config, interface_section) + when ConnectionConfig::Bonding + load_bonding(config, interface_section) + when ConnectionConfig::Wireless + load_wireless(config, interface_section) + end - # TODO: type specific configs config end @@ -81,6 +75,72 @@ def create_config(interface_section) ConnectionConfig::Ethernet.new # TODO: use type detector to read it from sys end + + def load_generic(config, interface_section) + config.bootproto = BootProtocol.from_name(interface_section.bootproto) + config.name = interface_section.name || interface_section.device # device is just fallback + if config.bootproto == BootProtocol::STATIC + # TODO: report if ipaddr missing for static config + ipaddr = IPAddress.from_string(interface_section.ipaddr) + # Assign first netmask, as prefixlen has precedence so it will overwrite it + ipaddr.netmask = interface_section.netmask if interface_section.netmask + ipaddr.prefix = interface_section.prefixlen.to_i if interface_section.prefixlen + broadcast = interface_section.broadcast && IPAddress.new(interface_section.broadcast) + remote = interface_section.remote_ipaddr && IPAddress.new(interface_section.remote_ipaddr) + config.ip = IPConfig.new(ipaddr, broadcast: broadcast, remote_address: remote) + end + + config.startmode = Startmode.create(interface_section.startmode) if interface_section.startmode + config.startmode.priority = interface_section.ifplugd_priority if config.startmode.name == "ifplugd" && interface_section.ifplugd_priority + config.mtu = interface_section.mtu.to_i if interface_section.mtu + config.ethtool_options = interface_section.ethtool_options if interface_section.ethtool_options + config.firewall_zone = interface_section.zone if interface_section.zone + end + + def load_wireless(config, interface_section) + config.mode = interface_section.wireless_mode if interface_section.wireless_mode + config.ap = interface_section.wireless_ap if interface_section.wireless_ap + config.bitrate = interface_section.wireless_bitrate.to_f if interface_section.wireless_bitrate + config.ca_cert = interface_section.wireless_ca_cert if interface_section.wireless_ca_cert + config.channel = interface_section.wireless_channel.to_i if interface_section.wireless_channel + config.client_cert = interface_section.wireless_client_cert if interface_section.wireless_client_cert + config.client_key = interface_section.wireless_client_key if interface_section.wireless_client_key + config.essid = interface_section.wireless_essid if interface_section.wireless_essid + config.auth_mode = interface_section.wireless_auth_mode.to_sym if interface_section.wireless_auth_mode + config.nick = interface_section.wireless_nick if interface_section.wireless_nick + config.nwid = interface_section.wireless_nwid if interface_section.wireless_nwid + config.wpa_anonymous_identity = interface_section.wireless_wpa_anonid if interface_section.wireless_wpa_anonid + config.wpa_identity = interface_section.wireless_wpa_identity if interface_section.wireless_wpa_identity + config.wpa_password = interface_section.wireless_wpa_password if interface_section.wireless_wpa_password + config.wpa_psk = interface_section.wireless_wpa_psk if interface_section.wireless_wpa_psk + config.keys = [] + (0..3).each do |i| + key = interface_section.public_send(:"wireless_key#{i}") + config.keys << key if key && !key.empty? + end + config.default_key = interface_section.wireless_key.to_i if interface_section.wireless_key + config.key_length = interface_section.wireless_key_length.to_i if interface_section.wireless_key_length + end + + def load_vlan(config, interface_section) + config.vlan_id = interface_section.vlan_id.to_i if interface_section.vlan_id + config.parent_device = interface_section.etherdevice + end + + def load_bridge(config, interface_section) + config.ports = interface_section.bridge_ports.split + config.stp = interface_section.bridge_stp == "on" if interface_section.bridge_stp + config.forward_delay = interface_section.bridge_forward_delay.to_i if interface_section.bridge_forward_delay + end + + def load_bonding(config, interface_section) + config.options = interface_section.bonding_module_opts if interface_section.bonding_module_opts + config.slaves = [] + (0..9).each do |i| + slave = interface_section.public_send(:"bonding_slave#{i}") + config.slaves << slave if slave && !slave.empty? + end + end end end end diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb index 5f07952f7..6f8e4c0fb 100644 --- a/src/lib/y2network/autoinst_profile/interface_section.rb +++ b/src/lib/y2network/autoinst_profile/interface_section.rb @@ -80,6 +80,7 @@ def self.attributes { name: :bridge_stp }, # on/off { name: :bridge_forward_delay }, { name: :wireless_ap }, + { name: :wireless_auth_mode }, { name: :wireless_bitrate }, { name: :wireless_ca_cert }, { name: :wireless_channel }, @@ -202,6 +203,7 @@ def self.attributes # @return [String] time of delay # @!attribute wireless_ap + # @!attribute wireless_auth_mode # @!attribute wireless_bitrate # @!attribute wireless_ca_cert # @!attribute wireless_channel @@ -299,7 +301,7 @@ def init_from_wireless(config) @wireless_client_cert = config.client_cert @wireless_client_key = config.client_key @wireless_essid = config.essid - @wireless_mode = config.auth_mode.to_s + @wireless_auth_mode = config.auth_mode.to_s @wireless_nick = config.nick @wireless_nwid = config.nwid @wireless_wpa_anonid = config.wpa_anonymous_identity From 543f6a39b7175297637dedeb1f18df70c387d058 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 6 Sep 2019 12:57:19 +0200 Subject: [PATCH 333/471] test that attributes are properly assigned --- test/y2network/autoinst/interfaces_reader_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/y2network/autoinst/interfaces_reader_test.rb b/test/y2network/autoinst/interfaces_reader_test.rb index c11f30625..8b26a6e57 100644 --- a/test/y2network/autoinst/interfaces_reader_test.rb +++ b/test/y2network/autoinst/interfaces_reader_test.rb @@ -45,5 +45,11 @@ expect(subject.config).to be_a Y2Network::ConnectionConfigsCollection expect(subject.config.size).to eq(1) end + + it "assign properly all values in profile" do + config = subject.config.by_name("eth0") + expect(config.startmode).to eq Y2Network::Startmode.create("auto") + expect(config.bootproto).to eq Y2Network::BootProtocol.from_name("dhcp") + end end end From f2db2d75276c910628b9fcbb2acb5ab2908521b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 6 Sep 2019 13:04:47 +0100 Subject: [PATCH 334/471] Fix hostname parsing --- src/lib/y2network/hostname_reader.rb | 2 +- test/y2network/hostname_reader_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/hostname_reader.rb b/src/lib/y2network/hostname_reader.rb index 0f36af49c..cee79cdef 100644 --- a/src/lib/y2network/hostname_reader.rb +++ b/src/lib/y2network/hostname_reader.rb @@ -74,7 +74,7 @@ def hostname_from_install_inf # # @return [String] Hostname def hostname_from_system - Yast::Execute.on_target!("/usr/bin/hostname", "--fqdn", stdout: :capture) + Yast::Execute.on_target!("/usr/bin/hostname", "--fqdn", stdout: :capture).strip rescue Cheetah::ExecutionFailed name = Yast::SCR.Read(Yast::Path.new(".target.string"), "/etc/hostname").to_s.strip name.empty? ? nil : name diff --git a/test/y2network/hostname_reader_test.rb b/test/y2network/hostname_reader_test.rb index bf6b05097..4403a63fc 100644 --- a/test/y2network/hostname_reader_test.rb +++ b/test/y2network/hostname_reader_test.rb @@ -120,7 +120,7 @@ describe "#hostname_from_system" do it "returns the systems' hostname" do expect(Yast::Execute).to receive(:on_target!).with("/usr/bin/hostname", "--fqdn", stdout: :capture) - .and_return("foo") + .and_return("foo\n") expect(reader.hostname_from_system).to eq("foo") end From ecf06ec6460cd153a23d1402befd0c9d5ca14002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 6 Sep 2019 13:21:11 +0100 Subject: [PATCH 335/471] Update from code review --- src/lib/y2network/autoinst/dns_reader.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/autoinst/dns_reader.rb b/src/lib/y2network/autoinst/dns_reader.rb index 65d9d21c5..967a1bf00 100644 --- a/src/lib/y2network/autoinst/dns_reader.rb +++ b/src/lib/y2network/autoinst/dns_reader.rb @@ -30,6 +30,8 @@ class DNSReader # @return [AutoinstProfile::DNSSection] attr_reader :section + DEFAULT_RESOLV_CONF_POLICY = "auto".freeze + # @param section [AutoinstProfile::DNSSection] def initialize(section) @section = section @@ -43,7 +45,7 @@ def config dhcp_hostname: section.dhcp_hostname, hostname: section.hostname || default_hostname, nameservers: valid_ips(section.nameservers), - resolv_conf_policy: section.resolv_conf_policy || "auto", + resolv_conf_policy: section.resolv_conf_policy || DEFAULT_RESOLV_CONF_POLICY, searchlist: section.searchlist ) end From b538edf4a97342074913936bf4672b0524f8b0b2 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 6 Sep 2019 15:23:41 +0200 Subject: [PATCH 336/471] fixes to make Export/Import working --- src/clients/lan_auto.rb | 72 +++++++++---------- .../y2network/autoinst/interfaces_reader.rb | 4 ++ .../autoinst_profile/interfaces_section.rb | 9 ++- src/modules/LanItems.rb | 6 -- 4 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/clients/lan_auto.rb b/src/clients/lan_auto.rb index 49fc03456..5cfb8917c 100644 --- a/src/clients/lan_auto.rb +++ b/src/clients/lan_auto.rb @@ -135,50 +135,44 @@ def ToAY(settings) settings = deep_copy(settings) interfaces = [] discard = ["UDI", "_nm_name"] - Builtins.foreach(Ops.get_map(settings, "devices", {})) do |_type, devsmap| - Builtins.foreach( - Convert.convert(devsmap, from: "map", to: "map ") - ) do |device, devmap| - newmap = {} - Builtins.foreach( - Convert.convert(devmap, from: "map", to: "map ") - ) do |key, val| - Builtins.y2milestone("Adding: %1=%2", key, val) - if key != "_aliases" - if Ops.greater_than(Builtins.size(Convert.to_string(val)), 0) && - !Builtins.contains(discard, key) && - !Builtins.contains(discard, Builtins.tolower(key)) - Ops.set(newmap, Builtins.tolower(key), Convert.to_string(val)) - end - else - # handle aliases - Builtins.y2debug("val: %1", val) - # if aliases are empty, then ommit it - if Ops.greater_than(Builtins.size(Convert.to_map(val)), 0) - # replace key "0" into "alias0" (bnc#372678) - Builtins.foreach( - Convert.convert( - val, - from: "any", - to: "map >" - ) - ) do |k, v| - Ops.set( - newmap, - Builtins.tolower("aliases"), - Builtins.add( - Ops.get_map(newmap, Builtins.tolower("aliases"), {}), - Builtins.sformat("alias%1", k), - v - ) + Builtins.y2milestone("Devices: #{settings["devices"].inspect})") + Builtins.foreach(settings.fetch("devices", {}).fetch("interfaces", [])) do |devsmap| + newmap = {} + Builtins.foreach(devsmap) do |key, val| + Builtins.y2milestone("Adding: %1=%2", key, val) + if key != "_aliases" + if Ops.greater_than(Builtins.size(Convert.to_string(val)), 0) && + !Builtins.contains(discard, key) && + !Builtins.contains(discard, Builtins.tolower(key)) + Ops.set(newmap, Builtins.tolower(key), Convert.to_string(val)) + end + else + # handle aliases + Builtins.y2debug("val: %1", val) + # if aliases are empty, then ommit it + if Ops.greater_than(Builtins.size(Convert.to_map(val)), 0) + # replace key "0" into "alias0" (bnc#372678) + Builtins.foreach( + Convert.convert( + val, + from: "any", + to: "map >" + ) + ) do |k, v| + Ops.set( + newmap, + Builtins.tolower("aliases"), + Builtins.add( + Ops.get_map(newmap, Builtins.tolower("aliases"), {}), + Builtins.sformat("alias%1", k), + v ) - end + ) end end end - newmap["device"] = device - interfaces = Builtins.add(interfaces, newmap) end + interfaces = Builtins.add(interfaces, newmap) end # Modules diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index 19c2860fd..5aee0afe1 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -26,6 +26,8 @@ module Y2Network module Autoinst # This class is responsible of importing the AutoYast interfaces section class InterfacesReader + include Yast::Logger + # @return [AutoinstProfile::InterfacesSection] attr_reader :section @@ -42,6 +44,7 @@ def initialize(section) # @return [ConnectionConfigsCollection] the imported connections configs def config configs = @section.interfaces.map do |interface_section| + log.info "Creating config for interface section: #{interface_section.inspect}" config = create_config(interface_section) config.propose # propose reasonable defaults for not set attributes load_generic(config, interface_section) @@ -57,6 +60,7 @@ def config load_wireless(config, interface_section) end + log.info "Resulting config: #{config.inspect}" config end diff --git a/src/lib/y2network/autoinst_profile/interfaces_section.rb b/src/lib/y2network/autoinst_profile/interfaces_section.rb index fd995e6c2..b5b788802 100644 --- a/src/lib/y2network/autoinst_profile/interfaces_section.rb +++ b/src/lib/y2network/autoinst_profile/interfaces_section.rb @@ -46,6 +46,8 @@ module AutoinstProfile # # @see NetworkingSection class InterfacesSection < SectionWithAttributes + include Yast::Logger + def self.attributes [ { name: :interfaces } @@ -95,7 +97,12 @@ def init_from_network(connection_configs) # # @param hash [Hash] Interfaces section hash def interfaces_from_hash(hash) - hash.map { |h| InterfaceSection.new_from_hashes(h) } + hash.map do |h| + h = h["device"] if h["device"].is_a? ::Hash # hash can be enclosed in different hash + res = InterfaceSection.new_from_hashes(h) + log.info "interfaces section #{res.inspect} load from hash #{h.inspect}" + res + end end def interfaces_section(connection_configs) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 7e60e9940..9453d84ba 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1023,12 +1023,6 @@ def reset_cache def Import(settings) reset_cache - items = LanItems.Items - NetworkInterfaces.Import("netcard", settings["devices"] || {}) - NetworkInterfaces.List("netcard").each do |device| - items[items.size] = { "ifcfg" => device } - end - @autoinstall_settings["start_immediately"] = settings.fetch("start_immediately", false) @autoinstall_settings["strict_IP_check_timeout"] = settings.fetch("strict_IP_check_timeout", -1) @autoinstall_settings["keep_install_network"] = settings.fetch("keep_install_network", true) From b7b0cd5c5ce77ac258344a6a8a2ec37124ed0386 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 6 Sep 2019 15:42:52 +0200 Subject: [PATCH 337/471] mark as pending test for network_autoconfiguration that needs adaptation to new backend --- test/network_autoconfiguration_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 149af0373..8085b146d 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -277,7 +277,8 @@ def probe_netcard_factory(num) end end - context "when the proposal is required" do + # TODO: write it using new backend as now changes is not longer done in NetworkInterfaces + xcontext "when the proposal is required" do let(:proposal) { true } it "creates the virtulization proposal config" do From 3dde7011b1656d28cb5f152e06e559d88a39b5ba Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 9 Sep 2019 10:01:51 +0200 Subject: [PATCH 338/471] add helpers for bonding slaves and wireless keys --- .../autoinst_profile/interface_section.rb | 25 ++++++++++++++ .../interface_section_test.rb | 34 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb index 6f8e4c0fb..a74094d45 100644 --- a/src/lib/y2network/autoinst_profile/interface_section.rb +++ b/src/lib/y2network/autoinst_profile/interface_section.rb @@ -290,6 +290,31 @@ def init_from_config(config) true end + # Helper to get wireless keys as array + # @return [Array] + def wireless_keys + keys = [] + (0..3).each do |i| + key = public_send(:"wireless_key#{i}") + keys << key unless key.empty? + end + + keys + end + + # Helper to get bonding slaves as array + # @return [Array] + def bonding_slaves + slaves = [] + + (0..9).each do |i| + slave = public_send(:"bonding_slave#{i}") + slaves << slave unless slave.empty? + end + + slaves + end + private def init_from_wireless(config) diff --git a/test/y2network/autoinst_profile/interface_section_test.rb b/test/y2network/autoinst_profile/interface_section_test.rb index f8fe41a61..e52f4c0b4 100644 --- a/test/y2network/autoinst_profile/interface_section_test.rb +++ b/test/y2network/autoinst_profile/interface_section_test.rb @@ -57,4 +57,38 @@ expect(section.bootproto).to eq "dhcp4" end end + + describe "#wireless_keys" do + it "returns array" do + section = described_class.new_from_hashes({}) + expect(section.wireless_keys).to be_a Array + end + + it "return each defined wireless key" do + hash = { + "wireless_key1" => "test1", + "wireless_key3" => "test3", + } + + section = described_class.new_from_hashes(hash) + expect(section.wireless_keys).to eq ["test1", "test3"] + end + end + + describe "#bonding_slaves" do + it "returns array" do + section = described_class.new_from_hashes({}) + expect(section.bonding_slaves).to be_a Array + end + + it "return each defined wireless key" do + hash = { + "bonding_slave1" => "eth0", + "bonding_slave3" => "eth1", + } + + section = described_class.new_from_hashes(hash) + expect(section.bonding_slaves).to eq ["eth0", "eth1"] + end + end end From eaaddee491504efcb18a6f0fbc950029b2c913c1 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 9 Sep 2019 10:19:15 +0200 Subject: [PATCH 339/471] use common system config for autoyast import --- src/lib/y2network/autoinst/config_reader.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index 702f97713..f4547e263 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -44,13 +44,9 @@ def initialize(section) # @return [Y2Network::Config] Network configuration def config - attrs = { source: :sysconfig } - # How it works? For autoyast it reads current config and apply autoyast on top of it - attrs[:interfaces] = system_interfaces.interfaces - attrs[:connections] = system_interfaces.connections - attrs[:routing] = RoutingReader.new(section.routing).config if section.routing - attrs[:dns] = DNSReader.new(section.dns).config if section.dns - config = Y2Network::Config.new(attrs) + config = Yast::Lan.system_config || Yast::Config.new(source: :autoyast) + config.routing = RoutingReader.new(section.routing).config if section.routing + config.dns = DNSReader.new(section.dns).config if section.dns if section.interfaces interfaces = InterfacesReader.new(section.interfaces).config interfaces.each do |interface| From dcf287ff146a75a1c7ffc6d5ee66abd7ac83d5d6 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 9 Sep 2019 12:00:15 +0200 Subject: [PATCH 340/471] add autoinst type detector and few fixes --- src/lib/y2network/autoinst/config_reader.rb | 2 +- .../y2network/autoinst/interfaces_reader.rb | 11 ++-- src/lib/y2network/autoinst/type_detector.rb | 54 +++++++++++++++++++ test/y2network/autoinst/config_reader_test.rb | 1 + .../interface_section_test.rb | 4 +- 5 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 src/lib/y2network/autoinst/type_detector.rb diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index f4547e263..7ef4fc425 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -44,7 +44,7 @@ def initialize(section) # @return [Y2Network::Config] Network configuration def config - config = Yast::Lan.system_config || Yast::Config.new(source: :autoyast) + config = Yast::Lan.system_config || Y2Network::Config.new(source: :autoyast) config.routing = RoutingReader.new(section.routing).config if section.routing config.dns = DNSReader.new(section.dns).config if section.dns if section.interfaces diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index 5aee0afe1..e27ba46a2 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -19,6 +19,7 @@ require "yast" require "y2network/dns" +require "y2network/autoinst/type_detector" require "ipaddr" Yast.import "IP" @@ -70,14 +71,10 @@ def config private def create_config(interface_section) - # TODO: autoyast backend for type detector? + name = interface_section.name || interface_section.device + type = TypeDetector.type_of(name, interface_section) # TODO: TUN/TAP interface missing for autoyast? - return ConnectionConfig::Bonding.new if interface_section.bonding_slave0 && !interface_section.bonding_slave0.empty? - return ConnectionConfig::Bridge.new if interface_section.bridge_ports && !interface_section.bridge_ports.empty? - return ConnectionConfig::Vlan.new if interface_section.etherdevice && !interface_section.etherdevice.empty? - return ConnectionConfig::Wireless.new if interface_section.wireless_essid && !interface_section.wireless_essid.empty? - - ConnectionConfig::Ethernet.new # TODO: use type detector to read it from sys + ConnectionConfig.const_get(type.class_name).new end def load_generic(config, interface_section) diff --git a/src/lib/y2network/autoinst/type_detector.rb b/src/lib/y2network/autoinst/type_detector.rb new file mode 100644 index 000000000..426f74360 --- /dev/null +++ b/src/lib/y2network/autoinst/type_detector.rb @@ -0,0 +1,54 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/interface_type" +require "y2network/type_detector" +require "y2network/sysconfig/interface_file" + +module Y2Network + module Autoinst + # Detects type of given interface based on autoyast profile + class TypeDetector < Y2Network::TypeDetector + class << self + def type_of(iface, section) + type_by_sys(iface) || type_by_config(section) || InterfaceType::ETHERNET + end + + private + + # Checks wheter iface type can be recognized by interface configuration + def type_by_config(section) + # TODO: autoyast backend for type detector? + # TODO: TUN/TAP interface missing for autoyast? + if !section.bonding_slaves.empty? + InterfaceType::BONDING + elsif !section.bridge_ports.empty? + InterfaceType::BRIDGE + elsif !section.etherdevice.empty? + InterfaceType::VLAN + elsif !section.wireless_essid.empty? + InterfaceType::WIRELESS + # TODO: when autoyast define tun/tap add it there + end + end + end + end + end +end diff --git a/test/y2network/autoinst/config_reader_test.rb b/test/y2network/autoinst/config_reader_test.rb index 31ee9a38b..639d014c0 100644 --- a/test/y2network/autoinst/config_reader_test.rb +++ b/test/y2network/autoinst/config_reader_test.rb @@ -20,6 +20,7 @@ # find current contact information at www.suse.com. require_relative "../../test_helper" +require "y2network/config" require "y2network/autoinst_profile/networking_section" require "y2network/autoinst/config_reader" require "y2network/sysconfig/interfaces_reader" diff --git a/test/y2network/autoinst_profile/interface_section_test.rb b/test/y2network/autoinst_profile/interface_section_test.rb index e52f4c0b4..208374905 100644 --- a/test/y2network/autoinst_profile/interface_section_test.rb +++ b/test/y2network/autoinst_profile/interface_section_test.rb @@ -67,7 +67,7 @@ it "return each defined wireless key" do hash = { "wireless_key1" => "test1", - "wireless_key3" => "test3", + "wireless_key3" => "test3" } section = described_class.new_from_hashes(hash) @@ -84,7 +84,7 @@ it "return each defined wireless key" do hash = { "bonding_slave1" => "eth0", - "bonding_slave3" => "eth1", + "bonding_slave3" => "eth1" } section = described_class.new_from_hashes(hash) From 85990f6f812d401e60b2d5f89b9fae6bfb40b811 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 9 Sep 2019 16:36:57 +0200 Subject: [PATCH 341/471] implement read/write aliases to autoyast --- .../y2network/autoinst/interfaces_reader.rb | 11 +++++- .../autoinst_profile/interface_section.rb | 36 +++++++++++++++++-- .../autoinst/interfaces_reader_test.rb | 15 +++++++- .../interface_section_test.rb | 12 ++++++- 4 files changed, 69 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index e27ba46a2..a64807164 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -88,7 +88,16 @@ def load_generic(config, interface_section) ipaddr.prefix = interface_section.prefixlen.to_i if interface_section.prefixlen broadcast = interface_section.broadcast && IPAddress.new(interface_section.broadcast) remote = interface_section.remote_ipaddr && IPAddress.new(interface_section.remote_ipaddr) - config.ip = IPConfig.new(ipaddr, broadcast: broadcast, remote_address: remote) + config.ip = ConnectionConfig::IPConfig.new(ipaddr, broadcast: broadcast, remote_address: remote) + end + + # handle aliases + interface_section.aliases.each_value do |alias_h| + ipaddr = IPAddress.from_string(alias_h["IPADDR"]) + # Assign first netmask, as prefixlen has precedence so it will overwrite it + ipaddr.netmask = alias_h["NETMASK"] if alias_h["NETMASK"] + ipaddr.prefix = alias_h["PREFIXLEN"].delete("/").to_i if alias_h["PREFIXLEN"] + config.ip_aliases << ConnectionConfig::IPConfig.new(ipaddr, label: alias_h["LABEL"]) end config.startmode = Startmode.create(interface_section.startmode) if interface_section.startmode diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb index a74094d45..423524d20 100644 --- a/src/lib/y2network/autoinst_profile/interface_section.rb +++ b/src/lib/y2network/autoinst_profile/interface_section.rb @@ -161,7 +161,23 @@ def self.attributes # @return [String] bonding options # @!attribute aliases - # @return [Object] aliases for interface TODO: allows anything, so how it looks like? + # @example xml section for aliases from SLE15 + # + # + # 10.100.0.1 + # + # 255.255.255.0 + # 24 + # + # + # 10.100.0.2 + # + # 255.255.255.0 + # 24 + # + # + # + # @return [Object] aliases for interface # @!attribute mtu # @return [String] MTU for interface @@ -246,6 +262,15 @@ def initialize(*_args) # init everything to empty string public_send(:"#{attr[:name]}=", "") end + + self.aliases = {} + end + + # Overwrite base method to load also nested aliases + def init_from_hashes(hash) + super + + self.aliases = hash["aliases"] if hash["aliases"] end # Method used by {.new_from_network} to populate the attributes when cloning a network interface @@ -267,7 +292,14 @@ def init_from_config(config) @mtu = config.mtu.to_s if config.mtu @ethtool_options = config.ethtool_options if config.ethtool_options @zone = config.firewall_zone.to_s - # TODO: aliases but format is unknown + # see aliases for example output + @aliases = config.ip_aliases.each_with_index.each_with_object({}) do |(ip, index), res| + res["alias#{index}"] = { + "IPADDR" => ip.address.address.to_s, + "LABEL" => ip.label || "", + "PREFIXLEN" => ip.address.prefix.to_s + } + end case config when ConnectionConfig::Vlan diff --git a/test/y2network/autoinst/interfaces_reader_test.rb b/test/y2network/autoinst/interfaces_reader_test.rb index 8b26a6e57..1e3aca9a4 100644 --- a/test/y2network/autoinst/interfaces_reader_test.rb +++ b/test/y2network/autoinst/interfaces_reader_test.rb @@ -35,7 +35,19 @@ { "bootproto" => "dhcp", "name" => "eth0", - "startmode" => "auto" + "startmode" => "auto", + "aliases" => { + "alias0" => { + "IPADDR" => "10.100.0.1", + "PREFIXLEN" => "24", + "LABEL" => "test" + }, + "alias1" => { + "IPADDR" => "10.100.0.2", + "PREFIXLEN" => "24", + "LABEL" => "test2" + } + } } ] end @@ -50,6 +62,7 @@ config = subject.config.by_name("eth0") expect(config.startmode).to eq Y2Network::Startmode.create("auto") expect(config.bootproto).to eq Y2Network::BootProtocol.from_name("dhcp") + expect(config.ip_aliases.size).to eq 2 end end end diff --git a/test/y2network/autoinst_profile/interface_section_test.rb b/test/y2network/autoinst_profile/interface_section_test.rb index 208374905..93307b94e 100644 --- a/test/y2network/autoinst_profile/interface_section_test.rb +++ b/test/y2network/autoinst_profile/interface_section_test.rb @@ -34,12 +34,22 @@ c.ethtool_options = "test=1" c.interface = "eth0" c.ip = Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.new("10.100.0.1/24")) + c.ip_aliases = [ + Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.from_string("10.100.0.1/24"), label: "test"), + Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.from_string("10.100.0.2/24"), label: "test1") + ] end end - it "initializes the boot protocol value" do + it "initializes values properly" do section = described_class.new_from_network(config) expect(section.bootproto).to eq("static") + expect(section.aliases).to eq( + { + "alias0" => { "IPADDR" => "10.100.0.1", "PREFIXLEN" => "24", "LABEL" => "test" }, + "alias1" => { "IPADDR" => "10.100.0.2", "PREFIXLEN" => "24", "LABEL" => "test1" } + } + ) end end From 8d7fb5992060727ee73d7d38657ed471de98ba4b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 10 Sep 2019 09:48:09 +0200 Subject: [PATCH 342/471] remove aliases workaround for AY --- src/clients/lan_auto.rb | 44 +------------------ src/modules/Lan.rb | 37 +++------------- .../interface_section_test.rb | 6 +-- 3 files changed, 9 insertions(+), 78 deletions(-) diff --git a/src/clients/lan_auto.rb b/src/clients/lan_auto.rb index 5cfb8917c..cd938759f 100644 --- a/src/clients/lan_auto.rb +++ b/src/clients/lan_auto.rb @@ -133,50 +133,10 @@ def main # @return [Hash] autoyast network settings def ToAY(settings) settings = deep_copy(settings) - interfaces = [] - discard = ["UDI", "_nm_name"] - Builtins.y2milestone("Devices: #{settings["devices"].inspect})") - Builtins.foreach(settings.fetch("devices", {}).fetch("interfaces", [])) do |devsmap| - newmap = {} - Builtins.foreach(devsmap) do |key, val| - Builtins.y2milestone("Adding: %1=%2", key, val) - if key != "_aliases" - if Ops.greater_than(Builtins.size(Convert.to_string(val)), 0) && - !Builtins.contains(discard, key) && - !Builtins.contains(discard, Builtins.tolower(key)) - Ops.set(newmap, Builtins.tolower(key), Convert.to_string(val)) - end - else - # handle aliases - Builtins.y2debug("val: %1", val) - # if aliases are empty, then ommit it - if Ops.greater_than(Builtins.size(Convert.to_map(val)), 0) - # replace key "0" into "alias0" (bnc#372678) - Builtins.foreach( - Convert.convert( - val, - from: "any", - to: "map >" - ) - ) do |k, v| - Ops.set( - newmap, - Builtins.tolower("aliases"), - Builtins.add( - Ops.get_map(newmap, Builtins.tolower("aliases"), {}), - Builtins.sformat("alias%1", k), - v - ) - ) - end - end - end - end - interfaces = Builtins.add(interfaces, newmap) - end + interfaces = settings["interfaces"] || [] + Builtins.y2milestone("interfaces: #{interfaces.inspect})") # Modules - s390_devices = [] Builtins.foreach(Ops.get_map(settings, "s390-devices", {})) do |_device, mod| s390_devices = Builtins.add(s390_devices, mod) diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 986390f24..4eb1ea9e2 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -626,36 +626,9 @@ def FromAY(input) input = deep_copy(input) Builtins.y2debug("input %1", input) - ifaces = [] - Builtins.foreach(Ops.get_list(input, "interfaces", [])) do |interface| - iface = {} - Builtins.foreach(interface) do |key, value| - if key == "aliases" - Builtins.foreach( - Convert.convert( - value, - from: "any", - to: "map >" - ) - ) do |k, v| - # replace "alias0" to "0" (bnc#372687) - t = Convert.convert( - value, - from: "any", - to: "map " - ) - Ops.set(t, Ops.get_string(v, "LABEL", ""), Ops.get_map(t, k, {})) - t = Builtins.remove(t, k) - value = deep_copy(t) - end - end - Ops.set(iface, key, value) - end - ifaces = Builtins.add(ifaces, iface) - end - Ops.set(input, "interfaces", ifaces) - - interfaces = Builtins.listmap(Ops.get_list(input, "interfaces", [])) do |interface| + input["interfaces"] ||= [] + # TODO: remove when s390 and udev no longer need it + interfaces = Builtins.listmap(input["interfaces"]) do |interface| # input: list of items $[ "device": "d", "foo": "f", "bar": "b"] # output: map of items "d": $["FOO": "f", "BAR": "b"] new_interface = {} @@ -730,7 +703,7 @@ def FromAY(input) end Builtins.y2milestone("input=%1", input) - deep_copy(input) + input end # Import data. @@ -777,7 +750,7 @@ def Export ), "net-udev" => Ops.get_map(udev_rules, "net-udev", {}), "config" => NetworkConfig.Export, - "devices" => profile.interfaces ? profile.interfaces.to_hashes : {}, + "interfaces" => profile.interfaces ? profile.interfaces.interfaces.map(&:to_hashes) : [], "ipv6" => @ipv6, "routing" => profile.routing ? profile.routing.to_hashes : {}, "managed" => NetworkService.is_network_manager, diff --git a/test/y2network/autoinst_profile/interface_section_test.rb b/test/y2network/autoinst_profile/interface_section_test.rb index 93307b94e..fd8852a71 100644 --- a/test/y2network/autoinst_profile/interface_section_test.rb +++ b/test/y2network/autoinst_profile/interface_section_test.rb @@ -45,10 +45,8 @@ section = described_class.new_from_network(config) expect(section.bootproto).to eq("static") expect(section.aliases).to eq( - { - "alias0" => { "IPADDR" => "10.100.0.1", "PREFIXLEN" => "24", "LABEL" => "test" }, - "alias1" => { "IPADDR" => "10.100.0.2", "PREFIXLEN" => "24", "LABEL" => "test1" } - } + "alias0" => { "IPADDR" => "10.100.0.1", "PREFIXLEN" => "24", "LABEL" => "test" }, + "alias1" => { "IPADDR" => "10.100.0.2", "PREFIXLEN" => "24", "LABEL" => "test1" } ) end end From b19c097412995d2e9562892a072dc1acb2a079ed Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 10 Sep 2019 15:27:52 +0200 Subject: [PATCH 343/471] fix writting aliases from dialog --- src/lib/y2network/config.rb | 2 ++ src/lib/y2network/interface_config_builder.rb | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index a03d043ec..9e5b9c9f5 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -40,6 +40,7 @@ module Y2Network # config.write class Config include CanBeCopied + include Yast::Logger # @return [InterfacesCollection] attr_accessor :interfaces @@ -153,6 +154,7 @@ def delete_interface(name) # If the interface which is associated to does not exist (because it is a virtual one or it is # not present), it gets added. def add_or_update_connection_config(connection_config) + log.info "add_update connection config #{connection_config.inspect}" connections.add_or_update(connection_config) interface = interfaces.by_name(connection_config.interface) return if interface diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 77df0503e..419518df2 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -115,12 +115,15 @@ def save Yast::LanItems.driver_options[driver] = driver_options end + @connection_config.ip_aliases = aliases.each_with_object([]) do |map, result| + ipaddr = IPAddress.from_string(map[:ip]) + ipaddr.prefix = map[:prefixlen].delete("/").to_i if map[:prefixlen] + result << ConnectionConfig::IPConfig.new(ipaddr, label: map[:label]) + end + @connection_config.name = name @connection_config.interface = name - yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? - yast_config.add_or_update_connection_config(@connection_config) - # write to ifcfg always and to firewalld only when available @connection_config.firewall_zone = firewall_zone # create new instance as name can change firewall_interface = Y2Firewall::Firewalld::Interface.new(name) @@ -129,6 +132,10 @@ def save firewall_interface.zone = firewall_zone if !firewall_interface.zone || firewall_zone != firewall_interface.zone.name end + yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? + yast_config.add_or_update_connection_config(@connection_config) + + # write to ifcfg always and to firewalld only when available save_hostname nil From 028ef5661c13b339dbc546b69602f6b25080a80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 10 Sep 2019 15:27:57 +0100 Subject: [PATCH 344/471] Fix Config#delete_interface for virtual interfaces --- src/lib/y2network/config.rb | 6 ++++-- test/y2network/config_test.rb | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index a03d043ec..ca482319f 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -140,10 +140,12 @@ def rename_interface(old_name, new_name, mechanism) # deletes interface and all its config. If interface is physical, # it is not removed as we cannot remove physical interface. + # + # @param name [String] Interface's name def delete_interface(name) - connections.reject! { |c| c.name == name } + connections.reject! { |c| c.interface == name } interface = interfaces.by_name(name) - return if interface.hardware.exists? + return unless interface.is_a?(VirtualInterface) interfaces.reject! { |i| i.name == name } end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 1037c5922..ca59920bb 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -266,4 +266,38 @@ end end end + + describe "#delete_interface" do + let(:br0) { Y2Network::VirtualInterface.new("br0") } + let(:br0_conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| + conn.interface = "br0" + end + end + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, br0]) } + let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn, br0_conn]) } + + context "when it is a virtual interface" do + it "removes the connection config" do + expect { config.delete_interface(br0.name) }.to change { config.connections.to_a } + .from([eth0_conn, br0_conn]).to([eth0_conn]) + end + + it "removes the interface" do + expect { config.delete_interface(br0.name) }.to change { config.interfaces.to_a } + .from([eth0, br0]).to([eth0]) + end + end + + context "when it is a physical interface" do + it "removes the connection config" do + expect { config.delete_interface(eth0.name) }.to change { config.connections.to_a } + .from([eth0_conn, br0_conn]).to([br0_conn]) + end + + it "does not remove the interface" do + expect { config.delete_interface(eth0.name) }.to_not change { config.interfaces.to_a } + end + end + end end From 8c4b940bc9737025f3eef0e4c7f14adfd8a44dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 10 Sep 2019 15:46:38 +0100 Subject: [PATCH 345/471] Fix original hostname update in InterfaceConfigBuilder --- src/lib/y2network/interface_config_builder.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 77df0503e..a585edd2d 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -333,9 +333,7 @@ def subnet_prefix=(value) # @return [String] def hostname return @hostname if @hostname - - names = Yast::Host.names(@original_ip_config.address.to_s) - @original_hostname = @hostname = names.first || "" + original_hostname end # @param [String] value @@ -354,8 +352,8 @@ def save_hostname return end - return if @original_ip_config == connection_config.ip && @original_hostname == hostname - Yast::Host.Update(@original_hostname, hostname, @connection_config.ip.address.to_s) + return if @original_ip_config == connection_config.ip && original_hostname == hostname + Yast::Host.Update(original_hostname, hostname, @connection_config.ip.address.to_s) end # sets remote ip for ptp connections @@ -461,5 +459,14 @@ def yast_config def required_ip_config? boot_protocol == BootProtocol::STATIC end + + # Returns the original hostname + # + # @return [String] Original hostname + def original_hostname + return @original_hostname if @original_hostname + names = Yast::Host.names(@original_ip_config.address.to_s) + @original_hostname = names.first || "" + end end end From 83942e71fa8ad70a3804f82b8c253ef642917084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 10 Sep 2019 16:16:55 +0100 Subject: [PATCH 346/471] Remove hotplug interfaces --- src/lib/y2network/config.rb | 4 ++-- test/y2network/config_test.rb | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index ca482319f..59780e426 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -22,7 +22,7 @@ require "y2network/dns" require "y2network/interfaces_collection" require "y2network/connection_configs_collection" -require "y2network/virtual_interface" +require "y2network/physical_interface" require "y2network/can_be_copied" module Y2Network @@ -145,7 +145,7 @@ def rename_interface(old_name, new_name, mechanism) def delete_interface(name) connections.reject! { |c| c.interface == name } interface = interfaces.by_name(name) - return unless interface.is_a?(VirtualInterface) + return if interface.is_a?(PhysicalInterface) && interface.present? interfaces.reject! { |i| i.name == name } end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index ca59920bb..27d4fd16b 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -44,7 +44,7 @@ let(:table1) { Y2Network::RoutingTable.new([route1]) } let(:table2) { Y2Network::RoutingTable.new([route2]) } - let(:eth0) { Y2Network::Interface.new("eth0") } + let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } let(:eth0_conn) do @@ -277,7 +277,7 @@ let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, br0]) } let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn, br0_conn]) } - context "when it is a virtual interface" do + context "when it is not a physical interface" do it "removes the connection config" do expect { config.delete_interface(br0.name) }.to change { config.connections.to_a } .from([eth0_conn, br0_conn]).to([eth0_conn]) @@ -290,6 +290,12 @@ end context "when it is a physical interface" do + let(:present?) { true } + + before do + allow(eth0).to receive(:present?).and_return(present?) + end + it "removes the connection config" do expect { config.delete_interface(eth0.name) }.to change { config.connections.to_a } .from([eth0_conn, br0_conn]).to([br0_conn]) @@ -298,6 +304,13 @@ it "does not remove the interface" do expect { config.delete_interface(eth0.name) }.to_not change { config.interfaces.to_a } end + + context "when the interface is not present" do + it "removes the interface" do + expect { config.delete_interface(br0.name) }.to change { config.interfaces.to_a } + .from([eth0, br0]).to([eth0]) + end + end end end end From 6b304ae84fa8395cef27d916abaecbc6e9707cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 10 Sep 2019 16:19:14 +0100 Subject: [PATCH 347/471] Fix Y2Network::Config#delete_interface test --- test/y2network/config_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 27d4fd16b..6f66833fb 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -306,9 +306,11 @@ end context "when the interface is not present" do + let(:present?) { false } + it "removes the interface" do - expect { config.delete_interface(br0.name) }.to change { config.interfaces.to_a } - .from([eth0, br0]).to([eth0]) + expect { config.delete_interface(eth0.name) }.to change { config.interfaces.to_a } + .from([eth0, br0]).to([br0]) end end end From fbec7b768228349a3bb3f349dd1cd382fc8b709e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 11 Sep 2019 11:29:28 +0200 Subject: [PATCH 348/471] add interface summary and few fixes and improvements --- src/lib/y2network/connection_config/base.rb | 18 +++ .../connection_configs_collection.rb | 2 +- .../y2network/presenters/interface_summary.rb | 146 ++++++++++++++++++ src/lib/y2network/startmode.rb | 1 + src/lib/y2network/startmodes/auto.rb | 6 + src/lib/y2network/startmodes/hotplug.rb | 7 + src/lib/y2network/startmodes/ifplugd.rb | 6 + src/lib/y2network/startmodes/manual.rb | 6 + src/lib/y2network/startmodes/nfsroot.rb | 6 + src/lib/y2network/startmodes/off.rb | 6 + src/lib/y2network/widgets/interfaces_table.rb | 38 ++--- .../widgets/interfaces_table_test.rb | 6 +- 12 files changed, 221 insertions(+), 27 deletions(-) create mode 100644 src/lib/y2network/presenters/interface_summary.rb diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index a75516664..09178809c 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -126,6 +126,24 @@ def all_ips ([ip] + ip_aliases).compact end + + # find master from given collection of configs + # @param configs [ConnectionConfigsCollection] + # @return [ConnectionConfig::Bonding, ConnectionConfig::Bridge, nil] gets bridge, bonding or + # nil in which this device in enslaved + def find_master(configs) + configs.find do |config| + # TODO: what about VLAN? + if config.type.bonding? + config.slaves.include?(name) + elsif config.type.bridge? + config.ports.include?(name) + end + + false + end + end + private def replace_ifplugd? diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index 7689226ea..f959d87b4 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -36,7 +36,7 @@ class ConnectionConfigsCollection attr_reader :connection_configs alias_method :to_a, :connection_configs - def_delegators :@connection_configs, :each, :push, :<<, :reject!, :map, :flat_map, :any?, :size + def_delegators :@connection_configs, :each, :find, :push, :<<, :reject!, :map, :flat_map, :any?, :size # Constructor # diff --git a/src/lib/y2network/presenters/interface_summary.rb b/src/lib/y2network/presenters/interface_summary.rb new file mode 100644 index 000000000..c0338ea97 --- /dev/null +++ b/src/lib/y2network/presenters/interface_summary.rb @@ -0,0 +1,146 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +Yast.import "Summary" +Yast.import "HTML" + +module Y2Network + module Presenters + # This class converts a connection config configuration object into a string to be used + # in an AutoYaST summary or in table description. + class InterfaceSummary + include Yast::I18n + + # @return [String] + attr_reader :name + + # Constructor + # + # @param name [String] name of device to describe + # @param configs [Y2Network::ConnectionConfigsCollection] + # @param interfaces [Y2Network::InterfacesCollection] + def initialize(name, configs, interfaces) + textdomain "network" + @name = name + @configs = configs + @interfaces = interfaces + end + + def text + interface = @interfaces.by_name(@name) + hardware = interface ? interface.hardware : nil + descr = hardware ? hardware.description : "" + + config = @configs.by_name(@name) + bullets = [] + rich = "" + + if config + descr = config.name if descr.empty? + + status = status_info(config) + + bullets << _("Device Name: %s") % config.name + bullets << status + bullets << config.startmode.long_description + bullets += aliases_info(config) + + if config.type.bonding? + label = _("Bonding Slaves") + bullets << "#{label}: #{config.slaves.join(" ")}" + elsif config.type.bridge? + label = _("Bridge Ports") + bullets << "#{label}: #{config.ports.join(" ")}" + end + + master = config.find_master(@configs) + if master + master_desc = if master.type.bonding? + _("Bonding master") + else + _("Bridge") + end + bullets << format("%s: %s", master_desc, master.name) + end + end + + if hardware.nil? || !hardware.exists? + rich << "(" << _("No hardware information") << ")
    " + else + rich << "(" << _("Not connected") << ")
    " if !hardware.link + rich << "MAC : " << hardware.mac << "
    " if hardware.mac + rich << "BusID : " << hardware.busid << "
    " if hardware.busid + # TODO: physical port id. Probably in hardware? + end + + rich = Yast::HTML.Bold(descr) + "
    " + rich + if config + rich << Yast::HTML.List(bullets) + else + if hardware && hardware.name && !hardware.name.empty? + dev_name = _("Device Name: %s") % hardware.name + rich << Yast::HTML.Bold(dev_name) << "
    " + end + + rich << "

    " + rich << _("The device is not configured. Press Edit\nto configure.\n") + rich << "

    " + end + rich + end + + private + + def status_info(config) + if config.bootproto == BootProtocol::STATIC + return Yast::HTML.Colorize(_("Configured without an address"), "red") if !config.ip + + ip = config.ip.address.to_s + host = Yast::NetHwDetection.ResolveIP(config.ip.address.address.to_s) + addr = ip + addr << "(#{host})" if host && !host.empty? + if config.ip.remote_address + # TRANSLATORS %{local} is local address and %{remote} is remote address + format( + _("Configured with address %{local} (remote %{remote})"), + local: addr, + remote: config.remote_address.to_s + ) + else + # TRANSLATORS %s is address + format(_("Configured with address %s"), addr) + end + elsif config.bootproto == BootProtocol::NONE + _("Do not assign (e.g. bond or bridge slaves)") + else + # TODO: maybe human name for boot protocols? + format(_("Configured with %s"), config.bootproto.name) + + end + end + + def aliases_info(config) + config.ip_aliases.map do |alias_| + "#{alias_.address} (#{alias_.label})" + end + end + end + end +end diff --git a/src/lib/y2network/startmode.rb b/src/lib/y2network/startmode.rb index 170d67c65..e27017f1e 100644 --- a/src/lib/y2network/startmode.rb +++ b/src/lib/y2network/startmode.rb @@ -35,6 +35,7 @@ def initialize(name) # gets new instance of startmode for given type and its params def self.create(name) + name = "auto" if name == "onboot" # onboot is alias for auto # avoid circular dependencies require "y2network/startmodes" Startmodes.const_get(name.capitalize).new diff --git a/src/lib/y2network/startmodes/auto.rb b/src/lib/y2network/startmodes/auto.rb index 1329f87a4..4e3419ff6 100644 --- a/src/lib/y2network/startmodes/auto.rb +++ b/src/lib/y2network/startmodes/auto.rb @@ -40,6 +40,12 @@ def initialize def to_human_string _("At Boot Time") end + + def long_description + _( + "Started automatically at boot" + ) + end end end end diff --git a/src/lib/y2network/startmodes/hotplug.rb b/src/lib/y2network/startmodes/hotplug.rb index 89884500a..e647ecc1e 100644 --- a/src/lib/y2network/startmodes/hotplug.rb +++ b/src/lib/y2network/startmodes/hotplug.rb @@ -37,6 +37,13 @@ def initialize def to_human_string _("On Hotplug") end + + def long_description + _( + "Started automatically when attached" + ) + end + end end end diff --git a/src/lib/y2network/startmodes/ifplugd.rb b/src/lib/y2network/startmodes/ifplugd.rb index e3cfed907..f3f6b7a99 100644 --- a/src/lib/y2network/startmodes/ifplugd.rb +++ b/src/lib/y2network/startmodes/ifplugd.rb @@ -48,6 +48,12 @@ def to_human_string def ==(other) name == other.name && priority == other.priority end + + def long_description + _( + "Started automatically on cable connection" + ) + end end end end diff --git a/src/lib/y2network/startmodes/manual.rb b/src/lib/y2network/startmodes/manual.rb index 52491fa96..12713bb6b 100644 --- a/src/lib/y2network/startmodes/manual.rb +++ b/src/lib/y2network/startmodes/manual.rb @@ -36,6 +36,12 @@ def initialize def to_human_string _("Manually") end + + def long_description + _( + "Started manually" + ) + end end end end diff --git a/src/lib/y2network/startmodes/nfsroot.rb b/src/lib/y2network/startmodes/nfsroot.rb index b850c9a84..c8fd51133 100644 --- a/src/lib/y2network/startmodes/nfsroot.rb +++ b/src/lib/y2network/startmodes/nfsroot.rb @@ -39,6 +39,12 @@ def initialize def to_human_string _("On NFSroot") end + + def long_description + _( + "Started automatically at boot (mandatory)" + ) + end end end end diff --git a/src/lib/y2network/startmodes/off.rb b/src/lib/y2network/startmodes/off.rb index 2e6982a8b..78596e573 100644 --- a/src/lib/y2network/startmodes/off.rb +++ b/src/lib/y2network/startmodes/off.rb @@ -36,6 +36,12 @@ def initialize def to_human_string _("Never") end + + def long_description + _( + "Will not be started at all" + ) + end end end end diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index b3d159861..8e87ab974 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -19,6 +19,7 @@ require "yast" require "cwm/table" +require "y2network/presenters/interface_summary" module Y2Network module Widgets @@ -57,7 +58,7 @@ def items friendly_name(interface), interface_protocol(conn), interface.name, - "" + note(interface, conn, config) ] end end @@ -70,6 +71,17 @@ def init private + def note(interface, conn, config) + if interface.name != interface.old_name && interface.old_name + return format("%s -> %s", interface.old_name, interface.name) + end + + master = conn.find_master(config.connections) + return format(_("enslaved in %s"), master.name) if master + + "" + end + def interface_protocol(connection) return _("Not configured") if connection.nil? @@ -84,28 +96,8 @@ def interface_protocol(connection) end def create_description - interface = Yast::Lan.yast_config.interfaces.by_name(value) - hwinfo = interface.hardware - result = "" - if hwinfo.nil? || !hwinfo.exists? - result << "(" << _("No hardware information") << ")
    " - else - result << "(" << _("Not connected") << ")
    " if !hwinfo.link - result << "MAC : " << hwinfo.mac << "
    " if hwinfo.mac - result << "BusID : " << hwinfo.busid << "
    " if hwinfo.busid - end - connection = Yast::Lan.yast_config.connections.by_name(value) - if connection - result << _("Device Name: %s") % connection.name - # TODO: start mode description. Ideally in startmode class - # TODO: ip overview - else - result << "

    " << - _("The device is not configured. Press Edit\nto configure.\n") << - "

    " - end - - result + config = Yast::Lan.yast_config + Presenters::InterfaceSummary.new(value, config.connections, config.interfaces).text end # Returns a friendly name for a given interface diff --git a/test/y2network/widgets/interfaces_table_test.rb b/test/y2network/widgets/interfaces_table_test.rb index c516a9a1d..000e62dc7 100644 --- a/test/y2network/widgets/interfaces_table_test.rb +++ b/test/y2network/widgets/interfaces_table_test.rb @@ -29,12 +29,12 @@ let(:description) { double(:value= => nil) } - let(:eth0) { instance_double(Y2Network::Interface, name: "eth0", hardware: hwinfo) } - let(:br0) { instance_double(Y2Network::VirtualInterface, name: "br0", hardware: nil) } + let(:eth0) { instance_double(Y2Network::Interface, name: "eth0", hardware: hwinfo, old_name: "eth1") } + let(:br0) { instance_double(Y2Network::VirtualInterface, name: "br0", hardware: nil, old_name: nil) } let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, br0]) } let(:hwinfo) do instance_double(Y2Network::Hwinfo, link: link, mac: mac, busid: busid, - exists?: exists?, present?: true, description: "") + exists?: exists?, present?: true, description: "", name: "Coold device", ) end let(:mac) { "01:23:45:67:89:ab" } let(:busid) { "0000:04:00.0" } From 3bee424dd340a9a82d08ab6d878233fc8e63cb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 11 Sep 2019 12:24:59 +0100 Subject: [PATCH 349/471] Add a test for EditInterface widget --- test/y2network/widgets/edit_interface_test.rb | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 test/y2network/widgets/edit_interface_test.rb diff --git a/test/y2network/widgets/edit_interface_test.rb b/test/y2network/widgets/edit_interface_test.rb new file mode 100644 index 000000000..f9634e7bf --- /dev/null +++ b/test/y2network/widgets/edit_interface_test.rb @@ -0,0 +1,71 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/edit_interface" +require "y2network/config" + +describe Y2Network::Widgets::EditInterface do + subject { described_class.new(table) } + + let(:selected) { "eth0" } + let(:table) { double("table", value: selected) } + let(:config) { Y2Network::Config.new(interfaces: interfaces, connections: connections, source: :sysconfig) } + let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } + let(:eth1) { Y2Network::PhysicalInterface.new("eth1") } + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, eth1]) } + let(:eth0_conn) do + Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| + conn.name = "eth0" + end + end + let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn]) } + let(:sequence) { instance_double(Y2Network::Sequences::Interface, edit: nil) } + + before do + allow(Yast::Lan).to receive(:yast_config).and_return(config) + allow(Y2Network::Sequences::Interface).to receive(:new).and_return(sequence) + end + + include_examples "CWM::PushButton" + + describe "#handle" do + it "runs the interface edition sequence" do + expect(sequence).to receive(:edit) do |builder| + expect(builder.type.short_name).to eq("eth") + expect(builder.name).to eq("eth0") + end + subject.handle + end + + context "when the interface is unconfigured" do + let(:selected) { "eth1" } + + it "runs the interface edition sequence" do + expect(sequence).to receive(:edit) do |builder| + expect(builder.type.short_name).to eq("eth") + expect(builder.name).to eq("eth1") + end + subject.handle + end + end + end +end From ba27c4fa3d77bbd6dff885a98c753ec41561c0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 11 Sep 2019 12:30:07 +0100 Subject: [PATCH 350/471] Do not crash when editing an unconfigured device --- src/lib/y2network/widgets/edit_interface.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/widgets/edit_interface.rb b/src/lib/y2network/widgets/edit_interface.rb index 2b6ba9094..d8838b45e 100644 --- a/src/lib/y2network/widgets/edit_interface.rb +++ b/src/lib/y2network/widgets/edit_interface.rb @@ -40,10 +40,18 @@ def label def handle config = Yast::Lan.yast_config.copy - # TODO: handle unconfigured connection_config = config.connections.by_name(@table.value) - builder = Y2Network::InterfaceConfigBuilder.for(connection_config.type, config: connection_config) - builder.name = connection_config.name + + name, type = + if connection_config + [connection_config.name, connection_config.type] + else + interface = config.interfaces.by_name(@table.value) + [interface.name, interface.type] + end + + builder = Y2Network::InterfaceConfigBuilder.for(type, config: connection_config) + builder.name = name Y2Network::Sequences::Interface.new.edit(builder) :redraw end From 13a6c9cded379a6b51b84d5e86db009056d8c116 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 11 Sep 2019 13:39:33 +0200 Subject: [PATCH 351/471] make rubocop happy --- src/lib/y2network/connection_config/base.rb | 1 - src/lib/y2network/startmodes/hotplug.rb | 1 - test/y2network/widgets/interfaces_table_test.rb | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 09178809c..89aa10321 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -126,7 +126,6 @@ def all_ips ([ip] + ip_aliases).compact end - # find master from given collection of configs # @param configs [ConnectionConfigsCollection] # @return [ConnectionConfig::Bonding, ConnectionConfig::Bridge, nil] gets bridge, bonding or diff --git a/src/lib/y2network/startmodes/hotplug.rb b/src/lib/y2network/startmodes/hotplug.rb index e647ecc1e..e8a03f67b 100644 --- a/src/lib/y2network/startmodes/hotplug.rb +++ b/src/lib/y2network/startmodes/hotplug.rb @@ -43,7 +43,6 @@ def long_description "Started automatically when attached" ) end - end end end diff --git a/test/y2network/widgets/interfaces_table_test.rb b/test/y2network/widgets/interfaces_table_test.rb index 000e62dc7..14bfdf31c 100644 --- a/test/y2network/widgets/interfaces_table_test.rb +++ b/test/y2network/widgets/interfaces_table_test.rb @@ -34,7 +34,7 @@ let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, br0]) } let(:hwinfo) do instance_double(Y2Network::Hwinfo, link: link, mac: mac, busid: busid, - exists?: exists?, present?: true, description: "", name: "Coold device", ) + exists?: exists?, present?: true, description: "", name: "Coold device") end let(:mac) { "01:23:45:67:89:ab" } let(:busid) { "0000:04:00.0" } From c5cdd750758d42f38149882b12ab67979379a5ab Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 11 Sep 2019 14:44:39 +0200 Subject: [PATCH 352/471] implement summary for all interfaces --- .../y2network/presenters/interface_status.rb | 59 +++++++++++++++++++ .../y2network/presenters/interface_summary.rb | 31 +--------- .../presenters/interfaces_summary.rb | 55 +++++++++++++++++ src/modules/Lan.rb | 15 ++++- 4 files changed, 130 insertions(+), 30 deletions(-) create mode 100644 src/lib/y2network/presenters/interface_status.rb create mode 100644 src/lib/y2network/presenters/interfaces_summary.rb diff --git a/src/lib/y2network/presenters/interface_status.rb b/src/lib/y2network/presenters/interface_status.rb new file mode 100644 index 000000000..9fdaab45e --- /dev/null +++ b/src/lib/y2network/presenters/interface_status.rb @@ -0,0 +1,59 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +Yast.import "HTML" +Yast.import "NetHwDetection" + +module Y2Network + module Presenters + # Mixin that provide status info about interface `status_info(config)` + module InterfaceStatus + # @param config [ConnectionConfig::Base] + # @return [String] status information + def status_info(config) + case config.bootproto + when BootProtocol::STATIC + return Yast::HTML.Colorize(_("Configured without an address"), "red") if !config.ip + + ip = config.ip.address.to_s + host = Yast::NetHwDetection.ResolveIP(config.ip.address.address.to_s) + addr = ip + addr << "(#{host})" if host && !host.empty? + if config.ip.remote_address + # TRANSLATORS %{local} is local address and %{remote} is remote address + format( + _("Configured with address %{local} (remote %{remote})"), + local: addr, + remote: config.remote_address.to_s + ) + else + # TRANSLATORS %s is address + format(_("Configured with address %s"), addr) + end + when BootProtocol::NONE + _("Do not assign (e.g. bond or bridge slaves)") + else + # TODO: maybe human name for boot protocols? + format(_("Configured with %s"), config.bootproto.name) + end + end + end + end +end diff --git a/src/lib/y2network/presenters/interface_summary.rb b/src/lib/y2network/presenters/interface_summary.rb index c0338ea97..661b43b2a 100644 --- a/src/lib/y2network/presenters/interface_summary.rb +++ b/src/lib/y2network/presenters/interface_summary.rb @@ -18,6 +18,8 @@ # find current contact information at www.suse.com. require "yast" +require "y2network/presenters/interface_status" + Yast.import "Summary" Yast.import "HTML" @@ -27,6 +29,7 @@ module Presenters # in an AutoYaST summary or in table description. class InterfaceSummary include Yast::I18n + include InterfaceStatus # @return [String] attr_reader :name @@ -108,34 +111,6 @@ def text private - def status_info(config) - if config.bootproto == BootProtocol::STATIC - return Yast::HTML.Colorize(_("Configured without an address"), "red") if !config.ip - - ip = config.ip.address.to_s - host = Yast::NetHwDetection.ResolveIP(config.ip.address.address.to_s) - addr = ip - addr << "(#{host})" if host && !host.empty? - if config.ip.remote_address - # TRANSLATORS %{local} is local address and %{remote} is remote address - format( - _("Configured with address %{local} (remote %{remote})"), - local: addr, - remote: config.remote_address.to_s - ) - else - # TRANSLATORS %s is address - format(_("Configured with address %s"), addr) - end - elsif config.bootproto == BootProtocol::NONE - _("Do not assign (e.g. bond or bridge slaves)") - else - # TODO: maybe human name for boot protocols? - format(_("Configured with %s"), config.bootproto.name) - - end - end - def aliases_info(config) config.ip_aliases.map do |alias_| "#{alias_.address} (#{alias_.label})" diff --git a/src/lib/y2network/presenters/interfaces_summary.rb b/src/lib/y2network/presenters/interfaces_summary.rb new file mode 100644 index 000000000..1d021ba4a --- /dev/null +++ b/src/lib/y2network/presenters/interfaces_summary.rb @@ -0,0 +1,55 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/presenters/interface_status" + +Yast.import "Summary" +Yast.import "HTML" + +module Y2Network + module Presenters + # This class converts a connection config configurations into a string to be used + # in an AutoYaST summary. + class InterfacesSummary + include Yast::I18n + include Yast::Logger + include InterfaceStatus + + # @return [Config] + attr_reader :config + + def initialize(config) + @config = config + end + + def text + overview = config.interfaces.map do |interface| + connection = config.connections.by_name(interface.name) + descr = interface.hardware ? interface.hardware.description : "" + descr = interface.name if descr.empty? + status = connection ? status_info(connection) : Yast::Summary.NotConfigured + Yast::Summary.Device(descr, status) + end + + Yast::Summary.DevicesList(overview) + end + end + end +end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 30b89d39e..0f342bf38 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -38,6 +38,7 @@ require "y2network/interface_config_builder" require "y2network/presenters/routing_summary" require "y2network/presenters/dns_summary" +require "y2network/presenters/interfaces_summary" require "shellwords" @@ -803,11 +804,11 @@ def Export def Summary(mode) case mode when "summary" - "#{LanItems.BuildLanOverview.first}#{dns_summary}#{routing_summary}" + "#{interfaces_summary}#{dns_summary}#{routing_summary}" when "proposal" "#{LanItems.summary(:proposal)}#{dns_summary}#{routing_summary}" else - LanItems.BuildLanOverview.first + interfaces_summary end end @@ -1131,6 +1132,16 @@ def dns_summary presenter.text end + # Returns the interfaces configuration summary + # + # @return [String] + def interfaces_summary + config = find_config(:yast) + return "" unless config + presenter = Y2Network::Presenters::InterfacesSummary.new(config) + presenter.text + end + def firewalld Y2Firewall::Firewalld.instance end From 2a5267fb6d27df40b3c80224b9086372b8dbbbdd Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 11 Sep 2019 15:39:08 +0200 Subject: [PATCH 353/471] add tests and fixes from review and testing --- src/lib/y2network/connection_config/base.rb | 2 - .../y2network/presenters/interface_summary.rb | 16 ++--- src/lib/y2network/widgets/interfaces_table.rb | 2 +- .../presenters/interface_summary_test.rb | 69 ++++++++++++++++++ .../presenters/interfaces_summary_test.rb | 71 +++++++++++++++++++ 5 files changed, 148 insertions(+), 12 deletions(-) create mode 100644 test/y2network/presenters/interface_summary_test.rb create mode 100644 test/y2network/presenters/interfaces_summary_test.rb diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 89aa10321..75d6c6d9a 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -138,8 +138,6 @@ def find_master(configs) elsif config.type.bridge? config.ports.include?(name) end - - false end end diff --git a/src/lib/y2network/presenters/interface_summary.rb b/src/lib/y2network/presenters/interface_summary.rb index 661b43b2a..f021128d9 100644 --- a/src/lib/y2network/presenters/interface_summary.rb +++ b/src/lib/y2network/presenters/interface_summary.rb @@ -26,7 +26,7 @@ module Y2Network module Presenters # This class converts a connection config configuration object into a string to be used - # in an AutoYaST summary or in table description. + # in an AutoYaST summary or in a table. class InterfaceSummary include Yast::I18n include InterfaceStatus @@ -37,21 +37,19 @@ class InterfaceSummary # Constructor # # @param name [String] name of device to describe - # @param configs [Y2Network::ConnectionConfigsCollection] - # @param interfaces [Y2Network::InterfacesCollection] - def initialize(name, configs, interfaces) + # @param config [Y2Network::Config] + def initialize(name, config) textdomain "network" @name = name - @configs = configs - @interfaces = interfaces + @config = config end def text - interface = @interfaces.by_name(@name) + interface = @config.interfaces.by_name(@name) hardware = interface ? interface.hardware : nil descr = hardware ? hardware.description : "" - config = @configs.by_name(@name) + config = @config.connections.by_name(@name) bullets = [] rich = "" @@ -73,7 +71,7 @@ def text bullets << "#{label}: #{config.ports.join(" ")}" end - master = config.find_master(@configs) + master = config.find_master(@config.connections) if master master_desc = if master.type.bonding? _("Bonding master") diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 8e87ab974..150bd59b6 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -97,7 +97,7 @@ def interface_protocol(connection) def create_description config = Yast::Lan.yast_config - Presenters::InterfaceSummary.new(value, config.connections, config.interfaces).text + Presenters::InterfaceSummary.new(value, config).text end # Returns a friendly name for a given interface diff --git a/test/y2network/presenters/interface_summary_test.rb b/test/y2network/presenters/interface_summary_test.rb new file mode 100644 index 000000000..40cd86dd8 --- /dev/null +++ b/test/y2network/presenters/interface_summary_test.rb @@ -0,0 +1,69 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "y2network/config" +require "y2network/connection_config" +require "y2network/connection_configs_collection" +require "y2network/interface" +require "y2network/interfaces_collection" +require "y2network/presenters/interface_summary" + +describe Y2Network::Presenters::InterfaceSummary do + subject(:presenter) { described_class.new(name, config) } + + let(:name) { "vlan1" } + + let(:config) do + Y2Network::Config.new( + interfaces: interfaces, connections: connections, source: :testing + ) + end + let(:interfaces) do + Y2Network::InterfacesCollection.new([ + double(Y2Network::Interface, hardware: nil, name: "vlan1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth0") + ]) + end + let(:connections) do + Y2Network::ConnectionConfigsCollection.new([vlan1, eth0]) + end + + let(:vlan1) do + config = Y2Network::ConnectionConfig::Vlan.new.tap(&:propose) + config.name = "vlan1" + config.parent_device = "eth0" + config + end + + let(:eth0) do + config = Y2Network::ConnectionConfig::Ethernet.new.tap(&:propose) + config.name = "eth0" + config + end + + describe "#text" do + it "returns a summary in text form" do + text = presenter.text + expect(text).to be_a(::String) + end + end +end diff --git a/test/y2network/presenters/interfaces_summary_test.rb b/test/y2network/presenters/interfaces_summary_test.rb new file mode 100644 index 000000000..3cec2f834 --- /dev/null +++ b/test/y2network/presenters/interfaces_summary_test.rb @@ -0,0 +1,71 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "y2network/config" +require "y2network/connection_config" +require "y2network/connection_configs_collection" +require "y2network/interface" +require "y2network/interfaces_collection" +require "y2network/presenters/interfaces_summary" + +describe Y2Network::Presenters::InterfacesSummary do + subject(:presenter) { described_class.new(config) } + + # testing scenario: TODO: have easy yaml mockup format + # - eth0 configured + # - eth1 unconfingured + # - vlan1 on top of eth0 + let(:config) do + Y2Network::Config.new( + interfaces: interfaces, connections: connections, source: :testing + ) + end + let(:interfaces) do + Y2Network::InterfacesCollection.new([ + double(Y2Network::Interface, hardware: nil, name: "vlan1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth0") + ]) + end + let(:connections) do + Y2Network::ConnectionConfigsCollection.new([vlan1, eth0]) + end + + let(:vlan1) do + config = Y2Network::ConnectionConfig::Vlan.new.tap(&:propose) + config.name = "vlan1" + config.parent_device = "eth0" + config + end + + let(:eth0) do + config = Y2Network::ConnectionConfig::Ethernet.new.tap(&:propose) + config.name = "eth0" + config + end + + describe "#text" do + it "returns a summary in text form" do + text = presenter.text + expect(text).to be_a(::String) + end + end +end From c77867f90fd32f223788c90b2fa7393ea031ddb9 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 11 Sep 2019 15:50:49 +0200 Subject: [PATCH 354/471] add textdomain --- src/lib/y2network/presenters/interface_status.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/y2network/presenters/interface_status.rb b/src/lib/y2network/presenters/interface_status.rb index 9fdaab45e..03ec6916f 100644 --- a/src/lib/y2network/presenters/interface_status.rb +++ b/src/lib/y2network/presenters/interface_status.rb @@ -25,9 +25,12 @@ module Y2Network module Presenters # Mixin that provide status info about interface `status_info(config)` module InterfaceStatus + include Yast::I18n # @param config [ConnectionConfig::Base] # @return [String] status information def status_info(config) + textdomain "network" + case config.bootproto when BootProtocol::STATIC return Yast::HTML.Colorize(_("Configured without an address"), "red") if !config.ip From 5b6a717c0c3697a2becb29f47c2777ee575fb6da Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 11 Sep 2019 16:18:11 +0200 Subject: [PATCH 355/471] fixes from review --- .../y2network/presenters/interface_summary.rb | 30 +++++++++++-------- .../presenters/interface_summary_test.rb | 12 ++++---- .../presenters/interfaces_summary_test.rb | 12 ++++---- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/lib/y2network/presenters/interface_summary.rb b/src/lib/y2network/presenters/interface_summary.rb index f021128d9..071fed1a8 100644 --- a/src/lib/y2network/presenters/interface_summary.rb +++ b/src/lib/y2network/presenters/interface_summary.rb @@ -49,33 +49,37 @@ def text hardware = interface ? interface.hardware : nil descr = hardware ? hardware.description : "" - config = @config.connections.by_name(@name) + connection = @config.connections.by_name(@name) bullets = [] rich = "" - if config - descr = config.name if descr.empty? + if connection + descr = connection.name if descr.empty? - status = status_info(config) + status = status_info(connection) - bullets << _("Device Name: %s") % config.name + bullets << _("Device Name: %s") % connection.name bullets << status - bullets << config.startmode.long_description - bullets += aliases_info(config) + bullets << connection.startmode.long_description + bullets += aliases_info(connection) - if config.type.bonding? + if connection.type.bonding? + # TRANSLATORS: text label before list of slaves label = _("Bonding Slaves") - bullets << "#{label}: #{config.slaves.join(" ")}" - elsif config.type.bridge? + bullets << "#{label}: #{connection.slaves.join(" ")}" + elsif connection.type.bridge? + # TRANSLATORS: text label before list of ports label = _("Bridge Ports") - bullets << "#{label}: #{config.ports.join(" ")}" + bullets << "#{label}: #{connection.ports.join(" ")}" end - master = config.find_master(@config.connections) + master = connection.find_master(@config.connections) if master master_desc = if master.type.bonding? + # TRANSLATORS: text label before device which is master for this device _("Bonding master") else + # TRANSLATORS: text label before device which is bridge for this device _("Bridge") end bullets << format("%s: %s", master_desc, master.name) @@ -92,7 +96,7 @@ def text end rich = Yast::HTML.Bold(descr) + "
    " + rich - if config + if connection rich << Yast::HTML.List(bullets) else if hardware && hardware.name && !hardware.name.empty? diff --git a/test/y2network/presenters/interface_summary_test.rb b/test/y2network/presenters/interface_summary_test.rb index 40cd86dd8..5590984b2 100644 --- a/test/y2network/presenters/interface_summary_test.rb +++ b/test/y2network/presenters/interface_summary_test.rb @@ -37,11 +37,13 @@ ) end let(:interfaces) do - Y2Network::InterfacesCollection.new([ - double(Y2Network::Interface, hardware: nil, name: "vlan1"), - double(Y2Network::Interface, hardware: double.as_null_object, name: "eth1"), - double(Y2Network::Interface, hardware: double.as_null_object, name: "eth0") - ]) + Y2Network::InterfacesCollection.new( + [ + double(Y2Network::Interface, hardware: nil, name: "vlan1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth0") + ] + ) end let(:connections) do Y2Network::ConnectionConfigsCollection.new([vlan1, eth0]) diff --git a/test/y2network/presenters/interfaces_summary_test.rb b/test/y2network/presenters/interfaces_summary_test.rb index 3cec2f834..156ceb62a 100644 --- a/test/y2network/presenters/interfaces_summary_test.rb +++ b/test/y2network/presenters/interfaces_summary_test.rb @@ -39,11 +39,13 @@ ) end let(:interfaces) do - Y2Network::InterfacesCollection.new([ - double(Y2Network::Interface, hardware: nil, name: "vlan1"), - double(Y2Network::Interface, hardware: double.as_null_object, name: "eth1"), - double(Y2Network::Interface, hardware: double.as_null_object, name: "eth0") - ]) + Y2Network::InterfacesCollection.new( + [ + double(Y2Network::Interface, hardware: nil, name: "vlan1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth1"), + double(Y2Network::Interface, hardware: double.as_null_object, name: "eth0") + ] + ) end let(:connections) do Y2Network::ConnectionConfigsCollection.new([vlan1, eth0]) From 5204d18cc4c619333df61af1363e3f2c6884eb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 09:52:50 +0100 Subject: [PATCH 356/471] Extend UdevRule to support drivers rules --- src/lib/y2network/udev_rule.rb | 75 ++++++++++++++++++++++++++++---- test/y2network/udev_rule_test.rb | 53 +++++++++++++++++++++- 2 files changed, 117 insertions(+), 11 deletions(-) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 94305566e..c00a56eae 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -23,7 +23,18 @@ module Y2Network # Simple udev rule class # # This class represents a network udev rule. The current implementation is quite simplistic, - # featuring a pretty simple API. + # featuring a an API which is tailored to our needs. + # + # Basically, udev rules are kept in two different files under `/etc/udev/rules.d`: + # + # * 70-persistent-net.rules ('net' group): rules to assign names to interfaces. + # * 79-yast2-drivers.rules ('drivers' group): rules to assign drivers to interfaces. + # + # This class offers a set of constructors to build different kinds of rules. + # See {#new_mac_based_rename}, {#new_bus_id_based_rename} and {#new_driver_assignment}. + # + # When it comes to write rules to the filesystem, we decided to offer different methods to + # write to each file. See {#write_net_rules} and {#write_drivers_rules}. # # @example Create a rule containing some key/value pairs (rule part) # rule = Y2Network::UdevRule.new( @@ -35,18 +46,24 @@ module Y2Network # @example Create a rule from a string # rule = UdevRule.find_for("eth0") # rule.to_s #=> "ACTION==\"add\", SUBSYSTEM==\"net\", ATTR{address}==\"?*31:78:f2\", NAME=\"eth0\"" + # + # @example Writing renaming rules + # rule = UdevRule.new_mac_based_rename("00:12:34:56:78:ab", "eth0") + # UdevRule.write_net_rules([rule]) + # + # @example Writing driver assignment rules + # rule = UdevRule.new_driver_assignment("virtio:d00000001v00001AF4", "virtio_net") + # rule.to_s #=> "ENV{MODALIAS}==\"virtio:d00000001v00001AF4\", ENV{MODALIAS}=\"e1000\"" + # UdevRule.write_drivers_rules([rule]) + # class UdevRule class << self # Returns all persistent network rules # # @return [Array] Persistent network rules - def all - return @all if @all - rules_map = Yast::SCR.Read(Yast::Path.new(".udev_persistent.net")) || {} - @all = rules_map.values.map do |parts| - udev_parts = parts.map { |p| UdevRulePart.from_string(p) } - new(udev_parts) - end + def all(group = :net) + @all ||= {} + @all[group] ||= find_rules(group) end # Returns the udev rule for a given device @@ -107,18 +124,56 @@ def new_network_rule(parts = []) new(base_parts.concat(parts)) end + # Returns a module assignment rule + # + # @param modalias [String] Interface's modalias + # @param driver_name [String] Module name + # @return [UdevRule] udev rule + def new_driver_assignment(modalias, driver_name) + parts = [ + UdevRulePart.new("ENV{MODALIAS}", "==", modalias), + UdevRulePart.new("ENV{MODALIAS}", "=", driver_name) + ] + new(parts) + end + # Writes udev rules to the filesystem # # @param udev_rules [Array] List of udev rules - def write(udev_rules) + def write_net_rules(udev_rules) Yast::SCR.Write(Yast::Path.new(".udev_persistent.rules"), udev_rules.map(&:to_s)) Yast::SCR.Write(Yast::Path.new(".udev_persistent.nil"), []) # Writes changes to the rules file end + # Writes drivers specific udev rules to the filesystem + # + # Those roles that does not have an "ENV{MODALIAS}=\"xxx\"" part will be ignored. + # + # @param udev_rules [Array] List of udev rules + def write_drivers_rules(udev_rules) + rules_hash = udev_rules.each_with_object({}) do |rule, hash| + driver = rule.part_value_for("ENV{MODALIAS}", "=") + next unless driver + hash[driver] = rule.parts.map(&:to_s) + end + Yast::SCR.Write(Yast::Path.new(".udev_persistent.drivers"), rules_hash) + Yast::SCR.Write(Yast::Path.new(".udev_persistent.nil"), []) # Writes changes to the rules file + end + # Clears rules cache map def reset_cache @all = nil end + + private + + def find_rules(group) + rules_map = Yast::SCR.Read(Yast::Path.new(".udev_persistent.#{group}")) || {} + rules_map.values.map do |parts| + udev_parts = parts.map { |p| UdevRulePart.from_string(p) } + new(udev_parts) + end + end end # @return [Array] Parts of the udev rule @@ -191,6 +246,8 @@ def dev_port end # Returns the device mentioned in the rule (if any) + # + # @return [String] def device part_value_for("NAME", "=") end diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index 637065197..a9d152192 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -27,15 +27,35 @@ let(:parts) { [] } - let(:udev_persistent) do + let(:udev_persistent_net) do { "eth0" => ["SUBSYSTEM==\"net\"", "ACTION==\"add\"", "ATTR{address}==\"?*31:78:f2\"", "NAME=\"eth0\""] } end + let(:udev_persistent_drivers) do + { + "virtio:d00000001v00001AF4" => ["ENV{MODALIAS}==\"virtio:d00000001v00001AF4\"", "ENV{MODALIAS}=\"e1000\""] + } + end + before do allow(Yast::SCR).to receive(:Read).with(Yast::Path.new(".udev_persistent.net")) - .and_return(udev_persistent) + .and_return(udev_persistent_net) + allow(Yast::SCR).to receive(:Read).with(Yast::Path.new(".udev_persistent.drivers")) + .and_return(udev_persistent_drivers) + end + + describe ".all" do + it "returns the rules from :net group" do + rules = described_class.all(:net) + expect(rules.first.to_s).to match(/NAME=/) + end + + it "returns the rules from :drivers group" do + rules = described_class.all(:drivers) + expect(rules.first.to_s).to match(/MODALIAS/) + end end describe ".find_for" do @@ -84,6 +104,35 @@ end end + describe ".new_driver_assignment" do + it "returns a module assignment rule" do + rule = described_class.new_driver_assignment("virtio:0000", "virtio_net") + expect(rule.to_s).to eq("ENV{MODALIAS}==\"virtio:0000\", ENV{MODALIAS}=\"virtio_net\"") + end + end + + describe ".write_net_rules" do + it "writes changes using the udev_persistent agent" do + expect(Yast::SCR).to receive(:Write).with( + Yast::Path.new(".udev_persistent.rules"), [udev_rule.to_s] + ) + expect(Yast::SCR).to receive(:Write).with(Yast::Path.new(".udev_persistent.nil"), []) + described_class.write_net_rules([udev_rule]) + end + end + + describe ".write_drivers_rules" do + let(:udev_rule) { described_class.new_driver_assignment("virtio:0000", "virtio_net") } + + it "writes changes using the udev_persistent agent" do + expect(Yast::SCR).to receive(:Write).with( + Yast::Path.new(".udev_persistent.drivers"), { "virtio_net" => udev_rule.parts.map(&:to_s) } + ) + expect(Yast::SCR).to receive(:Write).with(Yast::Path.new(".udev_persistent.nil"), []) + described_class.write_drivers_rules([udev_rule]) + end + end + describe "#add_part" do it "adds a new key/value to the rule" do udev_rule.add_part("ACTION", "==", "add") From 944524d02d86dadf99ae289194a9997c546d2536 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 11 Sep 2019 19:57:29 +0200 Subject: [PATCH 357/471] autoyast udev rules (WIP) --- .../autoinst_profile/networking_section.rb | 8 +- .../autoinst_profile/udev_rule_section.rb | 97 +++++++++++++++++ .../autoinst_profile/udev_rules_section.rb | 100 ++++++++++++++++++ .../networking_section_test.rb | 10 +- .../autoinst_profile/udev_rule_test.rb | 42 ++++++++ 5 files changed, 254 insertions(+), 3 deletions(-) create mode 100644 src/lib/y2network/autoinst_profile/udev_rule_section.rb create mode 100644 src/lib/y2network/autoinst_profile/udev_rules_section.rb create mode 100644 test/y2network/autoinst_profile/udev_rule_test.rb diff --git a/src/lib/y2network/autoinst_profile/networking_section.rb b/src/lib/y2network/autoinst_profile/networking_section.rb index dcef6bc63..dd19dc4b4 100644 --- a/src/lib/y2network/autoinst_profile/networking_section.rb +++ b/src/lib/y2network/autoinst_profile/networking_section.rb @@ -20,6 +20,7 @@ require "y2network/autoinst_profile/dns_section" require "y2network/autoinst_profile/interfaces_section" require "y2network/autoinst_profile/routing_section" +require "y2network/autoinst_profile/udev_rules_section" module Y2Network module AutoinstProfile @@ -39,6 +40,8 @@ class NetworkingSection attr_accessor :dns # @return [InterfacesSection] attr_accessor :interfaces + # @return [UdevRulesSection] + attr_accessor :udev_rules # Creates an instance based on the profile representation used by the AutoYaST modules # (hash with nested hashes and arrays). @@ -50,6 +53,7 @@ def self.new_from_hashes(hash) result.routing = RoutingSection.new_from_hashes(hash["routing"]) if hash["routing"] result.dns = DNSSection.new_from_hashes(hash["dns"]) if hash["dns"] result.interfaces = InterfacesSection.new_from_hashes(hash["interfaces"]) if hash["interfaces"] + result.udev_rules = UdevRulesSection.new_from_hashes(hash["net-udev"]) if hash["net-udev"] result end @@ -63,6 +67,7 @@ def self.new_from_network(config) result.routing = RoutingSection.new_from_network(config.routing) if config.routing result.dns = DNSSection.new_from_network(config.dns) if config.dns result.interfaces = InterfacesSection.new_from_network(config.connections) + result.udev_rules = UdevRulesSection.new_from_network(config.interfaces) result end @@ -73,7 +78,8 @@ def to_hashes { "routing" => routing.to_hashes, "dns" => dns.to_hashes, - "interfaces" => interfaces.to_hashes + "interfaces" => interfaces.to_hashes, + "net-udev" => udev_rules.to_hashes } end end diff --git a/src/lib/y2network/autoinst_profile/udev_rule_section.rb b/src/lib/y2network/autoinst_profile/udev_rule_section.rb new file mode 100644 index 000000000..ac499df53 --- /dev/null +++ b/src/lib/y2network/autoinst_profile/udev_rule_section.rb @@ -0,0 +1,97 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/autoinst_profile/section_with_attributes" + +module Y2Network + module AutoinstProfile + # This class represents an AutoYaST section under + # + # + # eth0 + # ATTR{address} + # 00:30:6E:08:EC:80 + # + # + # @see InterfacesSection + class UdevRuleSection < SectionWithAttributes + def self.attributes + [ + { name: :rule }, + { name: :value }, + { name: :name } + ] + end + + define_attr_accessors + + # @!attribute rule + # @return [String] type of rule. Supported now is "ATTR{address}" and "KERNELS". + # The first one is for MAC based rules and second for bus id based ones. + + # @!attribute value + # @return [String] mac or bus id value + + # @!attribute name + # @return [String] device name that should be used. + + # Clones a network interface into an AutoYaST udev rule section + # + # @param interface [Y2Network::Interface] + # @return [InterfacesSection, nil] Udev rule section or nil if udev naming is not implemented for interface + def self.new_from_network(interface) + return if interface.renaming_mechanism == :none + return unless interface.hardware + + new.tap { |r| r.init_from_config(interface) } + end + + def initialize(*_args) + super + + self.class.attributes.each do |attr| + # init everything to empty string + public_send(:"#{attr[:name]}=", "") + end + end + + # mapping of renaming_mechanism to rule string + RULE_MAPPING = { + mac: "ATTR{address}", + bus_id: "KERNELS" + } + + # mapping of renaming_mechanism to method to obtain value + VALUE_MAPPING = { + mac: :mac, + bus_id: :busid + } + + # Method used by {.new_from_network} to populate the attributes when cloning a udev rule + # + # @param interface [Y2Network::Interface] + def init_from_config(interface) + @name = interface.name + @rule = RULE_MAPPING[interface.renaming_mechanism] or + raise("invalid renaming mechanism #{interface.renaming_mechanism}") + @value = interface.hardware.public_send(VALUE_MAPPING[interface.renaming_mechanism]) + end + end + end +end diff --git a/src/lib/y2network/autoinst_profile/udev_rules_section.rb b/src/lib/y2network/autoinst_profile/udev_rules_section.rb new file mode 100644 index 000000000..17393c5e3 --- /dev/null +++ b/src/lib/y2network/autoinst_profile/udev_rules_section.rb @@ -0,0 +1,100 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/autoinst_profile/section_with_attributes" +require "y2network/autoinst_profile/udev_rule_section" + +module Y2Network + module AutoinstProfile + # This class represents an AutoYaST section under + # + # + # + # eth0 + # ATTR{address} + # 00:30:6E:08:EC:80 + # + # + # + # @see NetworkingSection + class UdevRulesSection < SectionWithAttributes + include Yast::Logger + + def self.attributes + [ + { name: :udev_rules, xml_name: :"net-udev" } + ] + end + + define_attr_accessors + + # @!attribute udev_rules + # @return [Array] + + # Clones network interfaces settings into an AutoYaST interfaces section + # + # @param config [Y2Network::Config] whole config as it need both interfaces and connection configs + # @return [UdevRulesSection] + def self.new_from_network(config) + new.tap { |r| r.init_from_network(config) } + end + + # Constructor + def initialize(*_args) + super + @udev_rules = [] + end + + # Method used by {.new_from_hashes} to populate the attributes when importing a profile + # + # @param hash [Array] see {.new_from_hashes}. In this case it is array of udev_rules + def init_from_hashes(hash) + @udev_rules = udev_rules_from_hash(hash) + end + + # Method used by {.new_from_network} to populate the attributes when cloning routing settings + # + # @param connection_configs [Y2Network::InterfacesCollection] Network settings + # @return [Boolean] Result true on success or false otherwise + def init_from_network(interfaces) + @udev_rules = udev_rules_section(interfaces) + end + + private + + # Returns an array of udev rules sections + # + # @param hash [Hash] net-udev section hash + def udev_rules_from_hash(hash) + hash.map do |h| + h = h["device"] if h["device"].is_a? ::Hash # hash can be enclosed in different hash + res = InterfaceSection.new_from_hashes(h) + log.info "interfaces section #{res.inspect} load from hash #{h.inspect}" + res + end + end + + def udev_rules_section(interfaces) + interfaces + .map { |i| Y2Network::AutoinstProfile::UdevRuleSection.new_from_network(i) } + .compact + end + end + end +end diff --git a/test/y2network/autoinst_profile/networking_section_test.rb b/test/y2network/autoinst_profile/networking_section_test.rb index 2b90fb0a9..9ca94bab7 100644 --- a/test/y2network/autoinst_profile/networking_section_test.rb +++ b/test/y2network/autoinst_profile/networking_section_test.rb @@ -47,14 +47,16 @@ describe ".new_from_hashes" do let(:hash) do { - "routing" => routing, - "dns" => dns + "routing" => routing, + "dns" => dns, + "net-udev" => net_udev } end let(:routing) { {} } let(:routing_section) { double("RoutingSection") } let(:dns) { {} } let(:dns_section) { double("DNSSection") } + let(:net_udev) { {} } before do allow(Y2Network::AutoinstProfile::RoutingSection).to receive(:new_from_hashes) @@ -91,5 +93,9 @@ end end + it "initializes the udev rules section" do + section = described_class.new_from_hashes(hash) + expect(section.udev_rules.udev_rules).to eq([]) + end end end diff --git a/test/y2network/autoinst_profile/udev_rule_test.rb b/test/y2network/autoinst_profile/udev_rule_test.rb new file mode 100644 index 000000000..be8b965cf --- /dev/null +++ b/test/y2network/autoinst_profile/udev_rule_test.rb @@ -0,0 +1,42 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/autoinst_profile/udev_rule_section" +require "y2network/connection_config/ip_config" + +describe Y2Network::AutoinstProfile::UdevRuleSection do + subject(:section) { described_class.new } + + describe ".new_from_network" do + let(:hardware) do + double(Y2Network::Hwinfo, mac: "mac1", busid: "bus1") + end + let(:interface) do + double(Y2Network::Interface, renaming_mechanism: :mac, hardware: hardware, name: "eth0") + end + + it "initializes values properly" do + section = described_class.new_from_network(interface) + expect(section.name).to eq "eth0" + expect(section.value).to eq "mac1" + expect(section.rule).to eq "ATTR{address}" + end + end +end From 4cefaa0fd13cdb838a2838057743c41b476b3afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 09:53:21 +0100 Subject: [PATCH 358/471] InterfacesWriter writes driver assignments rules --- src/lib/y2network/hwinfo.rb | 3 +- src/lib/y2network/physical_interface.rb | 14 ++++++++ .../y2network/sysconfig/interfaces_writer.rb | 29 +++++++++++++---- .../sysconfig/interfaces_writer_test.rb | 32 +++++++++++++++---- 4 files changed, 63 insertions(+), 15 deletions(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index ab6eb0b49..d72d9c135 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -194,7 +194,8 @@ def initialize(hwinfo = {}) { name: "wl_bitrates", default: nil }, { name: "dev_port", default: nil }, { name: "type", default: nil }, - { name: "name", default: "" } + { name: "name", default: "" }, + { name: "modalias", default: nil } ].each do |hwinfo_item| define_method hwinfo_item[:name].downcase do @hwinfo ? @hwinfo.fetch(hwinfo_item[:name], hwinfo_item[:default]) : hwinfo_item[:default] diff --git a/src/lib/y2network/physical_interface.rb b/src/lib/y2network/physical_interface.rb index 6bf4daa15..d56616b57 100644 --- a/src/lib/y2network/physical_interface.rb +++ b/src/lib/y2network/physical_interface.rb @@ -26,6 +26,13 @@ class PhysicalInterface < Interface # @return [String] attr_accessor :ethtool_options + # User selected driver + # + # This driver will be set using a udev rule. + # + # @return [String] + attr_accessor :driver + # Constructor # # @param name [String] Interface name (e.g., "eth0") @@ -38,6 +45,13 @@ def initialize(name, type: InterfaceType::ETHERNET, hardware: nil) @description = @hardware.name end + # Returns interface modalias + # + # @return [String,nil] Modalias + def modalias + @hardware.modalias + end + # Determines whether the interface is present (attached) # # It relies in the hardware information diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index affb93868..7c331e809 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -44,11 +44,11 @@ def write(interfaces) private - # Creates an udev rule for the given interface + # Creates an udev rule to rename the given interface # # @param iface [Interface] Interface to generate the udev rule for # @return [UdevRule,nil] udev rule or nil if it is not needed - def udev_rule_for(iface) + def renaming_udev_rule_for(iface) case iface.renaming_mechanism when :mac Y2Network::UdevRule.new_mac_based_rename(iface.name, iface.hardware.mac) @@ -57,19 +57,34 @@ def udev_rule_for(iface) end end + # Creates an udev rule to set the driver for the given interface + # + # @param iface [Interface] Interface to generate the udev rule for + # @return [UdevRule,nil] udev rule or nil if it is not needed + def driver_udev_rule_for(iface) + return nil unless iface.respond_to?(:driver) && iface.driver + Y2Network::UdevRule.new_driver_assignment(iface.modalias, iface.driver) + end + # Renames interfaces and refreshes the udev service # # @param interfaces [InterfaceCollection] Interfaces def update_udevd(interfaces) - update_udev_rules(interfaces) + update_renaming_udev_rules(interfaces) + update_drivers_udev_rules(interfaces) reload_udev_rules end - def update_udev_rules(interfaces) - udev_rules = interfaces.map { |i| udev_rule_for(i) }.compact + def update_renaming_udev_rules(interfaces) + udev_rules = interfaces.map { |i| renaming_udev_rule_for(i) }.compact known_names = interfaces.known_names - custom_rules = Y2Network::UdevRule.all.reject { |u| known_names.include?(u.device) } - Y2Network::UdevRule.write(custom_rules + udev_rules) + custom_rules = Y2Network::UdevRule.all(:net).reject { |u| known_names.include?(u.device) } + Y2Network::UdevRule.write_net_rules(custom_rules + udev_rules) + end + + def update_drivers_udev_rules(interfaces) + udev_rules = interfaces.map { |i| driver_udev_rule_for(i) }.compact + Y2Network::UdevRule.write_drivers_rules(udev_rules) end def reload_udev_rules diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index 4481a2ebf..396bb5ed4 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -30,17 +30,24 @@ describe "#write" do let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } let(:eth0) do - Y2Network::PhysicalInterface.new("eth0").tap { |i| i.renaming_mechanism = renaming_mechanism } + Y2Network::PhysicalInterface.new("eth0", hardware: hardware).tap do |i| + i.renaming_mechanism = renaming_mechanism + i.driver = driver + end end + let(:hardware) do - instance_double(Y2Network::Hwinfo, busid: "00:1c.0", mac: "01:23:45:67:89:ab", dev_port: "1") + instance_double( + Y2Network::Hwinfo, name: "Ethernet Card 0", busid: "00:1c.0", mac: "01:23:45:67:89:ab", + dev_port: "1", modalias: "virtio:d00000001v00001AF4" + ) end let(:renaming_mechanism) { :none } + let(:driver) { nil } let(:scr_root) { Dir.mktmpdir } before do allow(Yast::Execute).to receive(:on_target) - allow(eth0).to receive(:hardware).and_return(hardware) allow(writer).to receive(:sleep) # prevent collision with real hardware @@ -91,7 +98,7 @@ let(:renaming_mechanism) { :mac } it "writes a MAC based udev renaming rule" do - expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(Y2Network::UdevRule).to receive(:write_net_rules) do |rules| expect(rules.first.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ "ATTR{type}==\"1\", ATTR{dev_id}==\"0x0\", " \ @@ -106,7 +113,7 @@ let(:renaming_mechanism) { :bus_id } it "writes a BUS ID based udev renaming rule" do - expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(Y2Network::UdevRule).to receive(:write_net_rules) do |rules| expect(rules.first.to_s).to eq( "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", " \ "ATTR{type}==\"1\", KERNELS==\"00:1c.0\", ATTR{dev_port}==\"1\", NAME=\"eth1\"" @@ -124,7 +131,7 @@ end it "keeps the rule" do - expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(Y2Network::UdevRule).to receive(:write_net_rules) do |rules| expect(rules.first.to_s).to eq(unknown_rule.to_s) end subject.write(interfaces) @@ -136,13 +143,24 @@ let(:renaming_mechanism) { nil } it "does not write a udev rule" do - expect(Y2Network::UdevRule).to receive(:write) do |rules| + expect(Y2Network::UdevRule).to receive(:write_net_rules) do |rules| expect(rules).to be_empty end subject.write(interfaces) end end + context "when a driver is set for an interface" do + let(:driver) { "virtio_net" } + + it "writes an udev driver rule" do + expect(Y2Network::UdevRule).to receive(:write_drivers_rules) do |rules| + expect(rules.first.to_s).to eq("ENV{MODALIAS}==\"#{hardware.modalias}\", ENV{MODALIAS}=\"#{driver}\"") + end + subject.write(interfaces) + end + end + it "refreshes udev" do expect(Yast::Execute).to receive(:on_target).with("/usr/bin/udevadm", "control", any_args) expect(Yast::Execute).to receive(:on_target).with("/usr/bin/udevadm", "trigger", any_args) From 491db8d4cba4cc796cda56e214dfc5a7efb26236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 10:10:50 +0100 Subject: [PATCH 359/471] Read custom driver from udev rules --- src/lib/y2network/physical_interface.rb | 2 +- .../y2network/sysconfig/interfaces_reader.rb | 21 +++++++++++++++---- .../y2network/sysconfig/interfaces_writer.rb | 4 ++-- src/lib/y2network/udev_rule.rb | 16 +++++++++++++- .../sysconfig/interfaces_writer_test.rb | 2 +- test/y2network/udev_rule_test.rb | 16 ++++++++++++++ 6 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/lib/y2network/physical_interface.rb b/src/lib/y2network/physical_interface.rb index d56616b57..7fe0363d6 100644 --- a/src/lib/y2network/physical_interface.rb +++ b/src/lib/y2network/physical_interface.rb @@ -31,7 +31,7 @@ class PhysicalInterface < Interface # This driver will be set using a udev rule. # # @return [String] - attr_accessor :driver + attr_accessor :custom_driver # Constructor # diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 18f64ffb6..d7df85037 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -97,7 +97,8 @@ def find_connections # @param hwinfo [Hash] hardware information def build_physical_interface(hwinfo) Y2Network::PhysicalInterface.new(hwinfo.dev_name, hardware: hwinfo).tap do |iface| - iface.renaming_mechanism = renaming_mechanism_for(iface.name) + iface.renaming_mechanism = renaming_mechanism_for(iface) + iface.custom_driver = custom_driver_for(iface) iface.type = InterfaceType.from_short_name(hwinfo.type) || TypeDetector.type_of(iface.name) end end @@ -122,10 +123,10 @@ def add_interface(conn) # Detects the renaming mechanism used by the interface # - # @param name [String] Interface's name + # @param name [PhysicalInterface] Interface # @return [Symbol] :mac (MAC address), :bus_id (BUS ID) or :none (no renaming) - def renaming_mechanism_for(name) - rule = UdevRule.find_for(name) + def renaming_mechanism_for(iface) + rule = UdevRule.find_for(iface.name) return :none unless rule if rule.parts.any? { |p| p.key == "ATTR{address}" } :mac @@ -135,6 +136,18 @@ def renaming_mechanism_for(name) :none end end + + # Detects the custom driver used by the interface + # + # A driver is considered "custom" is it was set by the user through a udev rule. + # + # @param iface [PhysicalInterface] Interface to fetch the custom driver + # @return [String,nil] Custom driver (or nil if not set) + def custom_driver_for(iface) + return nil unless iface.modalias + rule = UdevRule.all(:drivers).find { |r| r.original_modalias == iface.modalias } + rule ? rule.driver : nil + end end end end diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 7c331e809..35676e723 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -62,8 +62,8 @@ def renaming_udev_rule_for(iface) # @param iface [Interface] Interface to generate the udev rule for # @return [UdevRule,nil] udev rule or nil if it is not needed def driver_udev_rule_for(iface) - return nil unless iface.respond_to?(:driver) && iface.driver - Y2Network::UdevRule.new_driver_assignment(iface.modalias, iface.driver) + return nil unless iface.respond_to?(:custom_driver) && iface.custom_driver + Y2Network::UdevRule.new_driver_assignment(iface.modalias, iface.custom_driver) end # Renames interfaces and refreshes the udev service diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index c00a56eae..0246411fe 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -247,9 +247,23 @@ def dev_port # Returns the device mentioned in the rule (if any) # - # @return [String] + # @return [String,nil] Device name or nil if not found def device part_value_for("NAME", "=") end + + # Returns the original modalias + # + # @return [String,nil] Original modalias or nil if not found + def original_modalias + part_value_for("ENV{MODALIAS}", "==") + end + + # Returns the modalias + # + # @return [String,nil] Original modalias or nil if not found + def driver + part_value_for("ENV{MODALIAS}", "=") + end end end diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index 396bb5ed4..6abde6114 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -32,7 +32,7 @@ let(:eth0) do Y2Network::PhysicalInterface.new("eth0", hardware: hardware).tap do |i| i.renaming_mechanism = renaming_mechanism - i.driver = driver + i.custom_driver = driver end end diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index a9d152192..6021e727c 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -212,4 +212,20 @@ expect(udev_rule.device).to eq("eth0") end end + + describe "#original_modalias" do + subject(:udev_rule) { described_class.new_driver_assignment("virtio:0000", "virtio_net") } + + it "returns the original modalias" do + expect(udev_rule.original_modalias).to eq("virtio:0000") + end + end + + describe "#driver" do + subject(:udev_rule) { described_class.new_driver_assignment("virtio:0000", "virtio_net") } + + it "return the assigned driver" do + expect(udev_rule.driver).to eq("virtio_net") + end + end end From cd27a24b74eee1e96a377d2ca4334b96b3b823e9 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 12 Sep 2019 13:46:38 +0200 Subject: [PATCH 360/471] fix assigning same name and just changing udev rule --- src/lib/y2network/config.rb | 4 +++- src/lib/y2network/interface.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 45f281f0b..3c630cdcf 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -133,8 +133,10 @@ def ==(other) # @param new_name [String] New interface's name # @param mechanism [Symbol] Property to base the rename on (:mac or :bus_id) def rename_interface(old_name, new_name, mechanism) - interface = interfaces.by_name(old_name) + log.info "Renaming #{old_name.inspect} to #{new_name.inspect} using #{mechanism.inspect}" + interface = interfaces.by_name(old_name || new_name) interface.rename(new_name, mechanism) + return unless old_name # do not modify configurations if it is just renaming mechanism connections.by_interface(old_name).each { |c| c.interface = new_name } dns.dhcp_hostname = new_name if dns.dhcp_hostname == old_name end diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 97e35a718..1f481192a 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -127,7 +127,7 @@ def drivers # @param mechanism [Symbol] Property to base the rename on (:mac or :bus_id) def rename(new_name, mechanism) log.info "Rename interface '#{name}' to '#{new_name}' using the '#{mechanism}'" - @old_name = name + @old_name = name if name != new_name # same name, just set different mechanism @name = new_name @renaming_mechanism = mechanism end From 87cca54471ecc09362abb35a5af26da0bd384071 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 12 Sep 2019 13:59:43 +0200 Subject: [PATCH 361/471] add tests --- src/lib/y2network/interface.rb | 4 ++++ test/y2network/config_test.rb | 8 ++++++++ test/y2network/interface_test.rb | 26 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 1f481192a..1898ba3aa 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -57,6 +57,10 @@ class << self # # @param conn [ConnectionConfig] Connection configuration related to the network interface def from_connection(conn) + # require here to avoid circular dependency + require "y2network/physical_interface" + require "y2network/virtual_interface" + interface_class = conn.virtual? ? VirtualInterface : PhysicalInterface interface_class.new(conn.interface || conn.name, type: conn.type) end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 6f66833fb..b7a192eaf 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -190,6 +190,14 @@ end end + context "when the old name is nil" do + it "adjust renaming mechanism only" do + config.rename_interface(nil, "eth0", :mac) + eth1 = config.interfaces.by_name("eth0") + expect(eth1.renaming_mechanism).to eq(:mac) + end + end + context "when dhcp_hostname points to the renamed interface" do before do allow(config.dns).to receive(:dhcp_hostname).and_return("eth0") diff --git a/test/y2network/interface_test.rb b/test/y2network/interface_test.rb index d3bfc7926..cd598331d 100644 --- a/test/y2network/interface_test.rb +++ b/test/y2network/interface_test.rb @@ -48,6 +48,32 @@ end end + describe "#rename" do + it "assign name to new_name parameter" do + interface.rename("eth1", :mac) + expect(interface.name).to eq "eth1" + end + + it "assign renaming_mechanism to mechanism parameter" do + interface.rename("eth1", :mac) + expect(interface.renaming_mechanism).to eq :mac + end + + context "if new_name differs to old one" do + it "assign old name to old_name attribute" do + interface.rename("eth1", :mac) + expect(interface.old_name).to eq "eth0" + end + end + + context "if new_name is same as old one" do + it "does not assign old_name attribute" do + interface.rename("eth0", :mac) + expect(interface.old_name).to eq nil + end + end + end + describe "#==" do context "given two interfaces with the same name" do let(:other) { Y2Network::Interface.new(interface.name) } From 6ca5520789a045837eecb05d49a176d5158f64bf Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 12 Sep 2019 15:08:21 +0200 Subject: [PATCH 362/471] add autoyast udev rules export --- src/clients/lan_auto.rb | 7 ++----- .../y2network/autoinst_profile/udev_rule_section.rb | 2 ++ .../y2network/autoinst_profile/udev_rules_section.rb | 12 +++++++----- src/modules/Lan.rb | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/clients/lan_auto.rb b/src/clients/lan_auto.rb index cd938759f..0798498ef 100644 --- a/src/clients/lan_auto.rb +++ b/src/clients/lan_auto.rb @@ -135,6 +135,8 @@ def ToAY(settings) settings = deep_copy(settings) interfaces = settings["interfaces"] || [] Builtins.y2milestone("interfaces: #{interfaces.inspect})") + net_udev = settings["net-udev"] || [] + Builtins.y2milestone("net-udev: #{net_udev.inspect})") # Modules s390_devices = [] @@ -142,11 +144,6 @@ def ToAY(settings) s390_devices = Builtins.add(s390_devices, mod) end - net_udev = [] - Builtins.foreach(Ops.get_map(settings, "net-udev", {})) do |_device, mod| - net_udev = Builtins.add(net_udev, mod) - end - modules = [] Builtins.foreach(Ops.get_map(settings, "hwcfg", {})) do |device, mod| newmap = {} diff --git a/src/lib/y2network/autoinst_profile/udev_rule_section.rb b/src/lib/y2network/autoinst_profile/udev_rule_section.rb index ac499df53..670c069fd 100644 --- a/src/lib/y2network/autoinst_profile/udev_rule_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rule_section.rb @@ -31,6 +31,8 @@ module AutoinstProfile # # @see InterfacesSection class UdevRuleSection < SectionWithAttributes + include Yast::Logger + def self.attributes [ { name: :rule }, diff --git a/src/lib/y2network/autoinst_profile/udev_rules_section.rb b/src/lib/y2network/autoinst_profile/udev_rules_section.rb index 17393c5e3..cd8efaf51 100644 --- a/src/lib/y2network/autoinst_profile/udev_rules_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rules_section.rb @@ -49,7 +49,7 @@ def self.attributes # Clones network interfaces settings into an AutoYaST interfaces section # - # @param config [Y2Network::Config] whole config as it need both interfaces and connection configs + # @param interface [Y2Network::InterfacesCollection] interfaces to detect udev rules # @return [UdevRulesSection] def self.new_from_network(config) new.tap { |r| r.init_from_network(config) } @@ -71,7 +71,6 @@ def init_from_hashes(hash) # Method used by {.new_from_network} to populate the attributes when cloning routing settings # # @param connection_configs [Y2Network::InterfacesCollection] Network settings - # @return [Boolean] Result true on success or false otherwise def init_from_network(interfaces) @udev_rules = udev_rules_section(interfaces) end @@ -83,17 +82,20 @@ def init_from_network(interfaces) # @param hash [Hash] net-udev section hash def udev_rules_from_hash(hash) hash.map do |h| - h = h["device"] if h["device"].is_a? ::Hash # hash can be enclosed in different hash res = InterfaceSection.new_from_hashes(h) - log.info "interfaces section #{res.inspect} load from hash #{h.inspect}" + log.info "udev rules section #{res.inspect} load from hash #{h.inspect}" res end end def udev_rules_section(interfaces) - interfaces + result = interfaces .map { |i| Y2Network::AutoinstProfile::UdevRuleSection.new_from_network(i) } .compact + + log.info "udev rules for interfaces: #{interfaces.inspect} => #{result.inspect}" + + result end end end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 9b9b5c183..39024dfdd 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -749,7 +749,7 @@ def Export "s390-devices", {} ), - "net-udev" => Ops.get_map(udev_rules, "net-udev", {}), + "net-udev" => profile.udev_rules ? profile.udev_rules.udev_rules.map(&:to_hashes) : [], "config" => NetworkConfig.Export, "interfaces" => profile.interfaces ? profile.interfaces.interfaces.map(&:to_hashes) : [], "ipv6" => @ipv6, From fcc26c8fb0f83853b0e428fb8788b34e9505cf64 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 12 Sep 2019 15:49:39 +0200 Subject: [PATCH 363/471] add to interfaces helper to find unused names --- src/lib/y2network/autoinst/interfaces_reader.rb | 1 - src/lib/y2network/dialogs/add_interface.rb | 3 ++- src/lib/y2network/interface_config_builder.rb | 7 +++---- src/lib/y2network/interfaces_collection.rb | 17 +++++++++++++++++ test/y2network/interfaces_collection_test.rb | 6 ++++++ 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index a64807164..f2585cbe3 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -33,7 +33,6 @@ class InterfacesReader attr_reader :section # @param section [AutoinstProfile::InterfacesSection] - # TODO: read also udev rules def initialize(section) @section = section end diff --git a/src/lib/y2network/dialogs/add_interface.rb b/src/lib/y2network/dialogs/add_interface.rb index 7b8e9992a..c76b45cd0 100644 --- a/src/lib/y2network/dialogs/add_interface.rb +++ b/src/lib/y2network/dialogs/add_interface.rb @@ -22,6 +22,7 @@ require "y2network/interface_config_builder" Yast.import "Label" +Yast.import "Lan" Yast.import "LanItems" Yast.import "NetworkInterfaces" @@ -64,7 +65,7 @@ def run # TODO: use factory to get proper builder builder = InterfaceConfigBuilder.for(InterfaceType.from_short_name(@type_widget.result)) - proposed_name = Yast::LanItems.new_type_devices(@type_widget.result, 1).first + proposed_name = Yast::Lan.yast_config.interfaces.free_name(@type_widget.result) builder.name = proposed_name builder diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index d50593f04..2669ac969 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -27,6 +27,7 @@ require "y2firewall/firewalld" require "y2firewall/firewalld/interface" +Yast.import "Lan" Yast.import "LanItems" Yast.import "NetworkInterfaces" Yast.import "Host" @@ -170,8 +171,7 @@ def renaming_mechanism # do not modify anything # @return [Array] def proposed_names - # TODO: new backend? - Yast::LanItems.new_type_devices(type.short_name, NEW_DEVICES_COUNT) + interfaces.free_names(type.short_name, NEW_DEVICES_COUNT) end # checks if passed name is valid as interface name @@ -182,8 +182,7 @@ def valid_name?(name) # checks if interface name already exists def name_exists?(name) - # TODO: new backend - Yast::NetworkInterfaces.List("").include?(name) + interfaces.known_names.include?(name) end # gets valid characters that can be used in interface name diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index dec0031e3..358b12922 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -157,5 +157,22 @@ def bond_index index end + + # @return [String] returns free interface name for given prefix + def free_name(prefix) + free_names(prefix, 1).first + end + + # @return [Array] returns free interface name for given prefix + def free_names(prefix, count) + result = [] + (0..).each do |i| + candidate = prefix + i.to_s + next if by_name(candidate) + + result << candidate + return result if result.size == count + end + end end end diff --git a/test/y2network/interfaces_collection_test.rb b/test/y2network/interfaces_collection_test.rb index 7a9c0cddc..df81eade9 100644 --- a/test/y2network/interfaces_collection_test.rb +++ b/test/y2network/interfaces_collection_test.rb @@ -106,4 +106,10 @@ end end end + + describe "#free_names" do + it "returns count of names with prefix that is not yet used" do + expect(collection.free_names("eth", 3)).to eq(["eth1", "eth2", "eth3"]) + end + end end From 99e8ed5318516077c84c269b13541f521f01faf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 15:28:08 +0100 Subject: [PATCH 364/471] Read available drivers --- src/lib/y2network/config.rb | 6 +++++- src/lib/y2network/driver.rb | 6 +++++- src/lib/y2network/hwinfo.rb | 1 + src/lib/y2network/sysconfig/config_reader.rb | 1 + .../y2network/sysconfig/interfaces_reader.rb | 18 +++++++++++++++++- test/y2network/sysconfig/config_reader_test.rb | 9 ++++++++- .../sysconfig/interfaces_reader_test.rb | 14 ++++++++++++-- 7 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 45f281f0b..92dd2d80d 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -50,6 +50,8 @@ class Config attr_accessor :routing # @return [DNS] DNS configuration attr_accessor :dns + # @return [Array] Available drivers + attr_accessor :drivers # @return [Symbol] Information source (see {Y2Network::Reader} and {Y2Network::Writer}) attr_accessor :source @@ -98,10 +100,12 @@ def configs # @param routing [Routing] Object with routing configuration # @param dns [DNS] Object with DNS configuration # @param source [Symbol] Configuration source + # @param drivers [Array] List of available drivers def initialize(interfaces: InterfacesCollection.new, connections: ConnectionConfigsCollection.new, - routing: Routing.new, dns: DNS.new, source:) + routing: Routing.new, dns: DNS.new, drivers: [], source:) @interfaces = interfaces @connections = connections + @drivers = drivers @routing = routing @dns = dns @source = source diff --git a/src/lib/y2network/driver.rb b/src/lib/y2network/driver.rb index 2654b1ddf..47e1862f6 100644 --- a/src/lib/y2network/driver.rb +++ b/src/lib/y2network/driver.rb @@ -17,11 +17,15 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "y2network/can_be_copied" + module Y2Network # This class represents a driver for an interface # # It is composed of a kernel module name and a string representing the module options class Driver + include CanBeCopied + # @return [String] Kernel module name attr_accessor :name # @return [String] Kernel module parameters @@ -32,7 +36,7 @@ def initialize(name, params = "") @params = params end - # Determines whether two interfaces are equal + # Determines whether two drivers are equal # # @param other [Driver] Driver to compare with # @return [Boolean] diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index d72d9c135..a8621b8ce 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -234,6 +234,7 @@ def merge!(other) # @return [Array] List of drivers def drivers drivers_list = @hwinfo.fetch("drivers", []) + return [] unless drivers_list[0] modules = drivers_list[0].fetch("modules", []) modules.map { |m| Driver.new(*m) } end diff --git a/src/lib/y2network/sysconfig/config_reader.rb b/src/lib/y2network/sysconfig/config_reader.rb index d58784a0f..84342aa12 100644 --- a/src/lib/y2network/sysconfig/config_reader.rb +++ b/src/lib/y2network/sysconfig/config_reader.rb @@ -48,6 +48,7 @@ def config Config.new( interfaces: interfaces_reader.interfaces, connections: interfaces_reader.connections, + drivers: interfaces_reader.drivers, routing: routing, dns: dns, source: :sysconfig diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index d7df85037..745ebc99c 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -48,7 +48,8 @@ def config return @config if @config find_physical_interfaces find_connections - @config = { interfaces: @interfaces, connections: @connections } + find_drivers + @config = { interfaces: @interfaces, connections: @connections, drivers: @drivers } end # Convenience method to get connections configuration @@ -66,6 +67,13 @@ def interfaces config[:interfaces] end + # Convenience method to get the drivers list + # + # @return [Array] + def drivers + config[:drivers] + end + private # Finds the physical interfaces @@ -92,6 +100,14 @@ def find_connections end end + # Finds the available drivers + def find_drivers + candidate_drivers = @interfaces + .select { |i| i.is_a?(Y2Network::PhysicalInterface) } + .flat_map { |i| i.drivers } + @drivers = candidate_drivers.map(&:copy).uniq + end + # Instantiates an interface given a hash containing hardware details # # @param hwinfo [Hash] hardware information diff --git a/test/y2network/sysconfig/config_reader_test.rb b/test/y2network/sysconfig/config_reader_test.rb index 042e1486e..03ba617d9 100644 --- a/test/y2network/sysconfig/config_reader_test.rb +++ b/test/y2network/sysconfig/config_reader_test.rb @@ -28,13 +28,15 @@ let(:interfaces) { [eth0, wlan0] } let(:eth0_config) { instance_double(Y2Network::ConnectionConfig::Ethernet) } let(:connections) { [eth0_config] } + let(:drivers) { Y2Network::Driver.new("virtio_net", "") } let(:routes_file) { instance_double(Y2Network::Sysconfig::RoutesFile, load: nil, routes: []) } let(:dns_reader) { instance_double(Y2Network::Sysconfig::DNSReader, config: dns) } let(:interfaces_reader) do instance_double( Y2Network::Sysconfig::InterfacesReader, interfaces: Y2Network::InterfacesCollection.new(interfaces), - connections: connections + connections: connections, + drivers: drivers ) end @@ -70,6 +72,11 @@ expect(config.dns).to eq(dns) end + it "returns a configuration which includes available drivers" do + config = reader.config + expect(config.drivers).to eq(drivers) + end + it "sets the config source to :sysconfig" do config = reader.config expect(config.source).to eq(:sysconfig) diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index e6cf2a0f3..c60b1a149 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -29,8 +29,9 @@ let(:eth0) do { - "active" => true, "dev_name" => "eth0", "mac" => "00:12:34:56:78:90", "name" => "Ethernet Connection", - "type" => "eth" + "active" => true, "dev_name" => "eth0", "mac" => "00:12:34:56:78:90", + "name" => "Ethernet Connection", "type" => "eth", + "drivers" => [{ "modules" => [["virtio_net", ""]] }] } end @@ -104,4 +105,13 @@ expect(conn.interface).to eq("eth0") end end + + describe "#drivers" do + it "returns a list of drivers" do + drivers = reader.drivers + expect(drivers).to eq( + [Y2Network::Driver.new("virtio_net", "")] + ) + end + end end From e28a450072d15c8ea2dfc7ed6a0c771ae057fd6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 15:47:23 +0100 Subject: [PATCH 365/471] Add some methods to Y2Network::Config to handle drivers --- src/lib/y2network/config.rb | 21 +++++++++++++++++++ test/y2network/config_test.rb | 39 ++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 92dd2d80d..e2c7d4c28 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -167,6 +167,27 @@ def add_or_update_connection_config(connection_config) interfaces << Interface.from_connection(connection_config) end + # Returns the candidate drivers for a given interface + # + # @return [Array] + def drivers_for_interface(name) + interface = interfaces.by_name(name) + names = interface.drivers.map(&:name) + drivers.select { |d| names.include?(d.name) } + end + + # Adds or update a driver + # + # @param new_driver [Driver] Driver to add or update + def add_or_update_driver(new_driver) + idx = drivers.find_index { |d| d.name == new_driver.name } + if idx + drivers[idx] = new_driver + else + drivers << new_driver + end + end + alias_method :eql?, :== end end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 6f66833fb..44723551d 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require_relative "../test_helper" require "y2network/config" +require "y2network/driver" require "y2network/routing_table" require "y2network/interface" require "y2network/interfaces_collection" @@ -34,7 +35,8 @@ subject(:config) do described_class.new( - interfaces: interfaces, connections: connections, routing: routing, source: :sysconfig + interfaces: interfaces, connections: connections, routing: routing, + drivers: drivers, source: :sysconfig ) end @@ -54,6 +56,9 @@ end let(:connections) { Y2Network::ConnectionConfigsCollection.new([eth0_conn]) } + let(:virtio_net) { Y2Network::Driver.new("virtio_net", "csum=1") } + let(:drivers) { [virtio_net] } + let(:routing) { Y2Network::Routing.new(tables: [table1, table2]) } describe ".from" do @@ -315,4 +320,36 @@ end end end + + describe "#drivers_for_interface" do + let(:e1000) { Y2Network::Driver.new("e1000", "") } + let(:drivers) { [virtio_net, e1000] } + + before do + allow(eth0).to receive(:drivers).and_return([Y2Network::Driver.new("virtio_net")]) + end + + it "returns the driver for a given interface" do + drivers = config.drivers_for_interface("eth0") + expect(drivers).to eq([virtio_net]) + end + end + + describe "#add_or_update_driver" do + let(:new_driver) { Y2Network::Driver.new("e1000", "") } + + it "adds the driver" do + config.add_or_update_driver(new_driver) + expect(config.drivers).to eq([virtio_net, new_driver]) + end + + context "when a driver with the same name already exists" do + let(:new_driver) { Y2Network::Driver.new("virtio_net", "csum=0") } + + it "replaces the driver with the given one" do + config.add_or_update_driver(new_driver) + expect(config.drivers).to eq([new_driver]) + end + end + end end From b37436eb9b79ca1ac44a79ab43266f22aeffc6f6 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 12 Sep 2019 16:54:05 +0200 Subject: [PATCH 366/471] implement udev rule import --- src/lib/y2network/autoinst/config_reader.rb | 3 + .../y2network/autoinst/udev_rules_reader.rb | 90 +++++++++++++++++++ .../autoinst_profile/udev_rule_section.rb | 23 ++--- .../autoinst_profile/udev_rules_section.rb | 27 +++--- src/lib/y2network/interface_config_builder.rb | 3 +- src/lib/y2network/interfaces_collection.rb | 3 +- src/modules/Lan.rb | 2 +- test/y2network/dialogs/add_interface_test.rb | 3 + test/y2network/widgets/interface_name_test.rb | 16 +++- 9 files changed, 139 insertions(+), 31 deletions(-) create mode 100644 src/lib/y2network/autoinst/udev_rules_reader.rb diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index 7ef4fc425..8571ec73c 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -23,6 +23,7 @@ require "y2network/autoinst/routing_reader" require "y2network/autoinst/dns_reader" require "y2network/autoinst/interfaces_reader" +require "y2network/autoinst/udev_rules_reader" require "y2network/autoinst_profile/networking_section" require "y2network/sysconfig/interfaces_reader" @@ -45,6 +46,8 @@ def initialize(section) # @return [Y2Network::Config] Network configuration def config config = Yast::Lan.system_config || Y2Network::Config.new(source: :autoyast) + # apply at first udev rules, so interfaces names are correct + UdevRulesReader.new(section.udev_rules).apply(config) if section.udev_rules config.routing = RoutingReader.new(section.routing).config if section.routing config.dns = DNSReader.new(section.dns).config if section.dns if section.interfaces diff --git a/src/lib/y2network/autoinst/udev_rules_reader.rb b/src/lib/y2network/autoinst/udev_rules_reader.rb new file mode 100644 index 000000000..437acbd39 --- /dev/null +++ b/src/lib/y2network/autoinst/udev_rules_reader.rb @@ -0,0 +1,90 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/autoinst_profile/udev_rule_section" + +module Y2Network + module Autoinst + # This class is responsible of importing the AutoYast udev rules section + # It is a bit different then other readers as it does not produce its config, + # but instead it is applied on top of current config by applying proper names + # for interfaces or creating new ones. + class UdevRulesReader + include Yast::Logger + + # @return [AutoinstProfile::UdevRulesSection] + attr_reader :section + + # @param section [AutoinstProfile::UdevRulesSectionSection] + def initialize(section) + @section = section + end + + # Apply udev rules on passed config + # @param config [Config] + def apply(config) + @section.udev_rules.each do |udev_rule| + target_interface = interface_for(config, udev_rule) + if target_interface + rename_interface(config, target_interface, udev_rule) + else + create_interface(config, udev_rule) + end + end + end + + private + + # find according to udev rule interface that match given hardware specification or nil if not exist + def interface_for(config, udev_rule) + config.interfaces.find do |interface| + next unless interface.hardware + + hw_method = AutoinstProfile::UdevRulesSectionSection::VALUE_MAPPING[udev_rule.rule] + interface.hardware.public_send(hw_method) == udev_rule.value + end + end + + def rename_interface(config, target_interface, udev_rule) + solve_collision(config, target_interface, udev_rule) + + old_name = target_interface.name == udev_rule.name ? nil : target_interface.name + mechanism = AutoinstProfile::UdevRulesSectionSection::RULE_MAPPING[udev_rule.rule] + config.rename_interface(old_name, udev_rule.name, mechanism) + end + + def create_interface(_config, udev_rule) + log.error "Cannot find interface to apply udev rule #{udev_rule.inspect}. Skipping ..." + end + + def solve_collision(config, target_interface, udev_rule) + existing_interface = config.interfaces.by_name(udev_rule.name) + return unless existing_interface + return if existing_interface == target_interface + + prefix = existing_interface.name[/\A(.*[^\d])\d+\z/, 1] + new_name = config.interfaces.new_name(prefix) + + # TODO: what mechanism should be default? + config.rename_interface(existing_interface.name, new_name, :mac) + end + end + end +end diff --git a/src/lib/y2network/autoinst_profile/udev_rule_section.rb b/src/lib/y2network/autoinst_profile/udev_rule_section.rb index 670c069fd..0eed163cd 100644 --- a/src/lib/y2network/autoinst_profile/udev_rule_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rule_section.rb @@ -21,13 +21,14 @@ module Y2Network module AutoinstProfile - # This class represents an AutoYaST section under + # This class represents an AutoYaST section under # - # - # eth0 - # ATTR{address} - # 00:30:6E:08:EC:80 - # + # @example xml content + # + # eth0 + # ATTR\{address\} + # 00:30:6E:08:EC:80 + # # # @see InterfacesSection class UdevRuleSection < SectionWithAttributes @@ -44,7 +45,7 @@ def self.attributes define_attr_accessors # @!attribute rule - # @return [String] type of rule. Supported now is "ATTR{address}" and "KERNELS". + # @return [String] type of rule. Supported now is `ATTR\{address\}` and `KERNELS`. # The first one is for MAC based rules and second for bus id based ones. # @!attribute value @@ -75,15 +76,15 @@ def initialize(*_args) # mapping of renaming_mechanism to rule string RULE_MAPPING = { - mac: "ATTR{address}", + mac: "ATTR{address}", bus_id: "KERNELS" - } + }.freeze # mapping of renaming_mechanism to method to obtain value VALUE_MAPPING = { - mac: :mac, + mac: :mac, bus_id: :busid - } + }.freeze # Method used by {.new_from_network} to populate the attributes when cloning a udev rule # diff --git a/src/lib/y2network/autoinst_profile/udev_rules_section.rb b/src/lib/y2network/autoinst_profile/udev_rules_section.rb index cd8efaf51..f5cda3bdb 100644 --- a/src/lib/y2network/autoinst_profile/udev_rules_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rules_section.rb @@ -24,13 +24,14 @@ module Y2Network module AutoinstProfile # This class represents an AutoYaST section under # - # - # - # eth0 - # ATTR{address} - # 00:30:6E:08:EC:80 - # - # + # @example xml content + # + # + # eth0 + # ATTR\{address\} + # 00:30:6E:08:EC:80 + # + # # # @see NetworkingSection class UdevRulesSection < SectionWithAttributes @@ -49,10 +50,10 @@ def self.attributes # Clones network interfaces settings into an AutoYaST interfaces section # - # @param interface [Y2Network::InterfacesCollection] interfaces to detect udev rules + # @param interfaces [Y2Network::InterfacesCollection] interfaces to detect udev rules # @return [UdevRulesSection] - def self.new_from_network(config) - new.tap { |r| r.init_from_network(config) } + def self.new_from_network(interfaces) + new.tap { |r| r.init_from_network(interfaces) } end # Constructor @@ -70,7 +71,7 @@ def init_from_hashes(hash) # Method used by {.new_from_network} to populate the attributes when cloning routing settings # - # @param connection_configs [Y2Network::InterfacesCollection] Network settings + # @param interfaces [Y2Network::InterfacesCollection] Network settings def init_from_network(interfaces) @udev_rules = udev_rules_section(interfaces) end @@ -90,8 +91,8 @@ def udev_rules_from_hash(hash) def udev_rules_section(interfaces) result = interfaces - .map { |i| Y2Network::AutoinstProfile::UdevRuleSection.new_from_network(i) } - .compact + .map { |i| Y2Network::AutoinstProfile::UdevRuleSection.new_from_network(i) } + .compact log.info "udev rules for interfaces: #{interfaces.inspect} => #{result.inspect}" diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 2669ac969..a39442fb7 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -27,7 +27,6 @@ require "y2firewall/firewalld" require "y2firewall/firewalld/interface" -Yast.import "Lan" Yast.import "LanItems" Yast.import "NetworkInterfaces" Yast.import "Host" @@ -456,6 +455,8 @@ def interfaces # # @return [Y2Network::Config] def yast_config + Yast.import "Lan" # avoid circular dependency + Yast::Lan.yast_config end diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index 358b12922..d5c0b238e 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -166,7 +166,8 @@ def free_name(prefix) # @return [Array] returns free interface name for given prefix def free_names(prefix, count) result = [] - (0..).each do |i| + # TODO: when switch rubocop use endless range `(0..)` + (0..100000).each do |i| candidate = prefix + i.to_s next if by_name(candidate) diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 39024dfdd..961c51c92 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -628,7 +628,7 @@ def FromAY(input) Builtins.y2debug("input %1", input) input["interfaces"] ||= [] - # TODO: remove when s390 and udev no longer need it + # TODO: remove when s390 no longer need it interfaces = Builtins.listmap(input["interfaces"]) do |interface| # input: list of items $[ "device": "d", "foo": "f", "bar": "b"] # output: map of items "d": $["FOO": "f", "BAR": "b"] diff --git a/test/y2network/dialogs/add_interface_test.rb b/test/y2network/dialogs/add_interface_test.rb index 43ba25bbe..294b33af1 100644 --- a/test/y2network/dialogs/add_interface_test.rb +++ b/test/y2network/dialogs/add_interface_test.rb @@ -30,6 +30,9 @@ before do allow(Y2Network::Widgets::InterfaceType).to receive(:new).and_return(double(result: "eth")) allow(subject).to receive(:cwm_show).and_return(:abort) + allow(Yast::Lan).to receive(:yast_config).and_return( + double(interfaces: double(free_name: "eth0", by_name: nil)) + ) end it "returns nil if canceled" do diff --git a/test/y2network/widgets/interface_name_test.rb b/test/y2network/widgets/interface_name_test.rb index 454e3b950..9f697fa92 100644 --- a/test/y2network/widgets/interface_name_test.rb +++ b/test/y2network/widgets/interface_name_test.rb @@ -25,10 +25,20 @@ describe Y2Network::Widgets::InterfaceName do let(:builder) do - Y2Network::InterfaceConfigBuilder.for("eth").tap { |b| b.name = "eth0" } + Y2Network::InterfaceConfigBuilder.for("eth") end subject { described_class.new(builder) } + let(:known_names) { [] } + + before do + allow(Yast::Lan).to receive(:yast_config).and_return( + double(interfaces: double(known_names: known_names, free_names: ["eth1"])) + ) + allow(builder).to receive(:find_interface) + builder.name = "eth0" + end + include_examples "CWM::ComboBox" describe "#validate" do @@ -37,7 +47,6 @@ it "passes for valid names only" do allow(subject).to receive(:value).and_return valid_name - allow(Yast::NetworkInterfaces).to receive(:List).and_return [] expect(Yast::Popup).to_not receive(:Error) expect(subject.validate).to be true @@ -46,16 +55,15 @@ # bnc#991486 it "fails for long names" do allow(subject).to receive(:value).and_return long_name - allow(Yast::NetworkInterfaces).to receive(:List).and_return [] expect(Yast::UI).to receive(:SetFocus) expect(subject.validate).to be false end context "when the name is already used" do + let(:known_names) { [valid_name] } before do allow(subject).to receive(:value).and_return valid_name - allow(Yast::NetworkInterfaces).to receive(:List).and_return [valid_name] end context "if the name was changed" do From 441d3abdf6b3e7c0e667f46928033fa3fc315a89 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 12 Sep 2019 17:08:08 +0200 Subject: [PATCH 367/471] fixes from testing --- src/lib/y2network/autoinst/udev_rules_reader.rb | 5 ++--- src/lib/y2network/autoinst_profile/udev_rule_section.rb | 5 +++++ src/lib/y2network/autoinst_profile/udev_rules_section.rb | 2 +- src/lib/y2network/interfaces_collection.rb | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/autoinst/udev_rules_reader.rb b/src/lib/y2network/autoinst/udev_rules_reader.rb index 437acbd39..54138d754 100644 --- a/src/lib/y2network/autoinst/udev_rules_reader.rb +++ b/src/lib/y2network/autoinst/udev_rules_reader.rb @@ -57,7 +57,7 @@ def interface_for(config, udev_rule) config.interfaces.find do |interface| next unless interface.hardware - hw_method = AutoinstProfile::UdevRulesSectionSection::VALUE_MAPPING[udev_rule.rule] + hw_method = AutoinstProfile::UdevRuleSection::VALUE_MAPPING[udev_rule.mechanism] interface.hardware.public_send(hw_method) == udev_rule.value end end @@ -66,8 +66,7 @@ def rename_interface(config, target_interface, udev_rule) solve_collision(config, target_interface, udev_rule) old_name = target_interface.name == udev_rule.name ? nil : target_interface.name - mechanism = AutoinstProfile::UdevRulesSectionSection::RULE_MAPPING[udev_rule.rule] - config.rename_interface(old_name, udev_rule.name, mechanism) + config.rename_interface(old_name, udev_rule.name, rule.mechanism) end def create_interface(_config, udev_rule) diff --git a/src/lib/y2network/autoinst_profile/udev_rule_section.rb b/src/lib/y2network/autoinst_profile/udev_rule_section.rb index 0eed163cd..2eb167ab8 100644 --- a/src/lib/y2network/autoinst_profile/udev_rule_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rule_section.rb @@ -95,6 +95,11 @@ def init_from_config(interface) raise("invalid renaming mechanism #{interface.renaming_mechanism}") @value = interface.hardware.public_send(VALUE_MAPPING[interface.renaming_mechanism]) end + + # helper to get mechanism symbol from rule + def mechanism + RULE_MAPPING.each_pair { |k,v| return k if v == rule } + end end end end diff --git a/src/lib/y2network/autoinst_profile/udev_rules_section.rb b/src/lib/y2network/autoinst_profile/udev_rules_section.rb index f5cda3bdb..567ff5b4a 100644 --- a/src/lib/y2network/autoinst_profile/udev_rules_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rules_section.rb @@ -83,7 +83,7 @@ def init_from_network(interfaces) # @param hash [Hash] net-udev section hash def udev_rules_from_hash(hash) hash.map do |h| - res = InterfaceSection.new_from_hashes(h) + res = UdevRuleSection.new_from_hashes(h) log.info "udev rules section #{res.inspect} load from hash #{h.inspect}" res end diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index d5c0b238e..e5bb7ac55 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -46,7 +46,7 @@ class InterfacesCollection attr_reader :interfaces alias_method :to_a, :interfaces - def_delegators :@interfaces, :each, :push, :<<, :reject!, :map, :flat_map, :any?, :size, :select + def_delegators :@interfaces, :each, :push, :<<, :reject!, :map, :flat_map, :any?, :size, :select, :find # Constructor # From 117ea59eab3be347303abd24ef956f3a40711f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 16:50:11 +0100 Subject: [PATCH 368/471] Read driver options from the underlying system --- src/lib/y2network/driver.rb | 27 ++++++++++- .../y2network/sysconfig/interfaces_reader.rb | 12 +++-- test/y2network/driver_test.rb | 46 +++++++++++++++++++ .../y2network/sysconfig/config_reader_test.rb | 2 +- .../sysconfig/interfaces_reader_test.rb | 12 ++--- test/y2network/udev_rule_test.rb | 2 +- 6 files changed, 87 insertions(+), 14 deletions(-) create mode 100644 test/y2network/driver_test.rb diff --git a/src/lib/y2network/driver.rb b/src/lib/y2network/driver.rb index 47e1862f6..60f1ca101 100644 --- a/src/lib/y2network/driver.rb +++ b/src/lib/y2network/driver.rb @@ -17,20 +17,33 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require "y2network/can_be_copied" +require "yast" module Y2Network # This class represents a driver for an interface # # It is composed of a kernel module name and a string representing the module options class Driver - include CanBeCopied + class << self + # Returns a driver using the information from the system + # + # @param name [String] Driver's name + def from_system(name) + params = Yast::SCR.Read(Yast::Path.new(".modules.options.#{name}")) + params_string = params.map { |k, v| "#{k}=#{v}" }.join(" ") + new(name, params_string) + end + end # @return [String] Kernel module name attr_accessor :name # @return [String] Kernel module parameters attr_accessor :params + # Constructor + # + # @param name [String] Driver name + # @param params [String] Driver parameters (e.g., "csum=1 debug=16") def initialize(name, params = "") @name = name @params = params @@ -44,6 +57,16 @@ def ==(other) name == other.name && params == other.params end + # Saves driver parameters to the underlying system + def save + parts = params.split(/ +/) + params_hash = parts.each_with_object({}) do |param, hash| + key, value = param.split("=") + hash[key] = value.to_s + end + Yast::SCR.Write(Yast::Path.new(".modules.options.#{name}"), params_hash) + end + # eql? (hash key equality) should alias ==, see also # https://ruby-doc.org/core-2.3.3/Object.html#method-i-eql-3F alias_method :eql?, :== diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 745ebc99c..ca9e770a9 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -102,10 +102,16 @@ def find_connections # Finds the available drivers def find_drivers - candidate_drivers = @interfaces + drivers_names = + @interfaces .select { |i| i.is_a?(Y2Network::PhysicalInterface) } - .flat_map { |i| i.drivers } - @drivers = candidate_drivers.map(&:copy).uniq + .flat_map(&:drivers) + .map(&:name) + .uniq + + @drivers = drivers_names.map do |name| + Y2Network::Driver.from_system(name) + end end # Instantiates an interface given a hash containing hardware details diff --git a/test/y2network/driver_test.rb b/test/y2network/driver_test.rb new file mode 100644 index 000000000..cd0f1d9fe --- /dev/null +++ b/test/y2network/driver_test.rb @@ -0,0 +1,46 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" + +require "y2network/driver" + +describe Y2Network::Driver do + subject(:driver) { described_class.new("virtio_net", "debug=16") } + + describe ".from_system" do + before do + allow(Yast::SCR).to receive(:Read).with(Yast::Path.new(".modules.options.virtio_net")) + .and_return("csum" => "1") + end + + it "reads the parameters from the underlying system" do + driver = described_class.from_system("virtio_net") + expect(driver.params).to eq("csum=1") + end + end + + describe "#save" do + it "writes options to the underlying system" do + expect(Yast::SCR).to receive(:Write) + .with(Yast::Path.new(".modules.options.virtio_net"), "debug" => "16") + driver.save + end + end +end diff --git a/test/y2network/sysconfig/config_reader_test.rb b/test/y2network/sysconfig/config_reader_test.rb index 03ba617d9..85537209f 100644 --- a/test/y2network/sysconfig/config_reader_test.rb +++ b/test/y2network/sysconfig/config_reader_test.rb @@ -36,7 +36,7 @@ Y2Network::Sysconfig::InterfacesReader, interfaces: Y2Network::InterfacesCollection.new(interfaces), connections: connections, - drivers: drivers + drivers: drivers ) end diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/sysconfig/interfaces_reader_test.rb index c60b1a149..27da24b8a 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/sysconfig/interfaces_reader_test.rb @@ -23,9 +23,8 @@ describe Y2Network::Sysconfig::InterfacesReader do subject(:reader) { described_class.new } - let(:netcards) do - [eth0] - end + + let(:netcards) { [eth0] } let(:eth0) do { @@ -46,6 +45,7 @@ let(:configured_interfaces) { ["lo", "eth0"] } let(:hardware_wrapper) { Y2Network::HardwareWrapper.new } + let(:driver) { Y2Network::Driver.new("virtio_net") } TYPES = { "eth0" => "eth" }.freeze @@ -57,6 +57,7 @@ allow(Yast::SCR).to receive(:Dir).and_call_original allow(Yast::NetworkInterfaces).to receive(:GetTypeFromSysfs) { |n| TYPES[n] } allow(Y2Network::UdevRule).to receive(:find_for).and_return(udev_rule) + allow(Y2Network::Driver).to receive(:from_system).and_return(driver) end around { |e| change_scr_root(File.join(DATA_PATH, "scr_read"), &e) } @@ -108,10 +109,7 @@ describe "#drivers" do it "returns a list of drivers" do - drivers = reader.drivers - expect(drivers).to eq( - [Y2Network::Driver.new("virtio_net", "")] - ) + expect(reader.drivers).to eq([driver]) end end end diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index 6021e727c..de679d63c 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -126,7 +126,7 @@ it "writes changes using the udev_persistent agent" do expect(Yast::SCR).to receive(:Write).with( - Yast::Path.new(".udev_persistent.drivers"), { "virtio_net" => udev_rule.parts.map(&:to_s) } + Yast::Path.new(".udev_persistent.drivers"), "virtio_net" => udev_rule.parts.map(&:to_s) ) expect(Yast::SCR).to receive(:Write).with(Yast::Path.new(".udev_persistent.nil"), []) described_class.write_drivers_rules([udev_rule]) From 6e4610b399c90bfa99a732127e34c641f2921306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 23:29:38 +0100 Subject: [PATCH 369/471] Write driver options to disk --- src/lib/y2network/driver.rb | 25 ++++++++++++++++++-- src/lib/y2network/sysconfig/config_writer.rb | 8 +++++++ test/y2network/driver_test.rb | 13 ++++++++-- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/driver.rb b/src/lib/y2network/driver.rb index 60f1ca101..d53f32dac 100644 --- a/src/lib/y2network/driver.rb +++ b/src/lib/y2network/driver.rb @@ -33,6 +33,19 @@ def from_system(name) params_string = params.map { |k, v| "#{k}=#{v}" }.join(" ") new(name, params_string) end + + # Writes driver options to the underlying system + # + # @param drivers [Y2Network::Driver] Drivers to write options + def write_options(drivers) + drivers.each(&:write_options) + commit + end + + # Commits drivers options to disk + def commit + Yast::SCR.Write(Yast::Path.new(".modules"), nil) + end end # @return [String] Kernel module name @@ -57,8 +70,16 @@ def ==(other) name == other.name && params == other.params end - # Saves driver parameters to the underlying system - def save + # Adds driver parameters to be written to the underlying system + # + # Parameters are not written to disk until Y2Network::Driver.commit + # is called. The reason is that writing them is an expensive operation, so it is + # better to write parameters for all drivers at the same time. + # + # You might prefer to use Y2Network::Driver.write_options instead. + # + # @see Y2Network::Driver.commit + def write_options parts = params.split(/ +/) params_hash = parts.each_with_object({}) do |param, hash| key, value = param.split("=") diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index b17927ee8..66c56bd99 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -46,6 +46,7 @@ def write(config, old_config = nil) file.routes = find_routes_for(nil, config.routing.routes) file.save + write_drivers(config.drivers) write_interfaces(config.interfaces) write_connections(config.connections) write_dns_settings(config, old_config) @@ -188,6 +189,13 @@ def write_connections(conns) writer = Y2Network::Sysconfig::ConnectionConfigWriter.new conns.each { |c| writer.write(c) } end + + # Writes drivers options + # + # @param drivers [Array] Drivers to write options + def write_drivers(drivers) + Y2Network::Driver.write_options(drivers) + end end end end diff --git a/test/y2network/driver_test.rb b/test/y2network/driver_test.rb index cd0f1d9fe..587afbf1f 100644 --- a/test/y2network/driver_test.rb +++ b/test/y2network/driver_test.rb @@ -36,11 +36,20 @@ end end - describe "#save" do + describe ".write_options" do + it "writes the parameters to the underlying system" do + expect(driver).to receive(:write_options) + expect(Yast::SCR).to receive(:Write) + .with(Yast::Path.new(".modules"), nil) + described_class.write_options([driver]) + end + end + + describe "#write_options" do it "writes options to the underlying system" do expect(Yast::SCR).to receive(:Write) .with(Yast::Path.new(".modules.options.virtio_net"), "debug" => "16") - driver.save + driver.write_options end end end From ce80c5870ff685ad03aafc8f328ac6e1635be694 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 13 Sep 2019 07:41:00 +0200 Subject: [PATCH 370/471] fix type and make rubocop happy --- src/lib/y2network/autoinst/udev_rules_reader.rb | 2 +- src/lib/y2network/autoinst_profile/udev_rule_section.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/autoinst/udev_rules_reader.rb b/src/lib/y2network/autoinst/udev_rules_reader.rb index 54138d754..ab9a3bc43 100644 --- a/src/lib/y2network/autoinst/udev_rules_reader.rb +++ b/src/lib/y2network/autoinst/udev_rules_reader.rb @@ -66,7 +66,7 @@ def rename_interface(config, target_interface, udev_rule) solve_collision(config, target_interface, udev_rule) old_name = target_interface.name == udev_rule.name ? nil : target_interface.name - config.rename_interface(old_name, udev_rule.name, rule.mechanism) + config.rename_interface(old_name, udev_rule.name, udev_rule.mechanism) end def create_interface(_config, udev_rule) diff --git a/src/lib/y2network/autoinst_profile/udev_rule_section.rb b/src/lib/y2network/autoinst_profile/udev_rule_section.rb index 2eb167ab8..9e9c55fcd 100644 --- a/src/lib/y2network/autoinst_profile/udev_rule_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rule_section.rb @@ -98,7 +98,7 @@ def init_from_config(interface) # helper to get mechanism symbol from rule def mechanism - RULE_MAPPING.each_pair { |k,v| return k if v == rule } + RULE_MAPPING.each_pair { |k, v| return k if v == rule } end end end From f00e8ed432dddeb6f99b44ab37cb6ba813afaa3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 06:18:42 +0100 Subject: [PATCH 371/471] Add support to InterfaceConfigBuilder to set the driver --- src/lib/y2network/interface_config_builder.rb | 38 ++++++----------- src/lib/y2network/physical_interface.rb | 7 ++++ .../interface_config_builder_test.rb | 42 +++++++++++++------ 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index d50593f04..4116727f3 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -109,12 +109,6 @@ def newly_added? # down, so here mainly workarounds, but ideally this save should change # completely backend def save - if !driver.empty? - # TODO: new backend? - Yast::LanItems.setDriver(driver) - Yast::LanItems.driver_options[driver] = driver_options - end - @connection_config.ip_aliases = aliases.each_with_object([]) do |map, result| ipaddr = IPAddress.from_string(map[:ip]) ipaddr.prefix = map[:prefixlen].delete("/").to_i if map[:prefixlen] @@ -132,6 +126,10 @@ def save firewall_interface.zone = firewall_zone if !firewall_interface.zone || firewall_zone != firewall_interface.zone.name end + if interface.respond_to?(:custom_driver) && driver + interface.custom_driver = driver.name if driver.name != interface.current_driver + yast_config.add_or_update_driver(driver) + end yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? yast_config.add_or_update_connection_config(@connection_config) @@ -193,9 +191,9 @@ def name_valid_characters end # gets a list of available kernel modules for the interface - def kernel_modules - # TODO: new backend? - Yast::LanItems.GetItemModules("") + def drivers + return [] unless interface + yast_config.drivers_for_interface(interface.name) end # gets currently assigned firewall zone @@ -246,30 +244,18 @@ def ifplugd_priority # gets currently assigned kernel module def driver - # TODO: new backend - @driver ||= Yast::Ops.get_string(Yast::LanItems.getCurrentItem, ["udev", "driver"], "") + return @driver if @driver + driver_name = @interface.custom_driver || @interface.current_driver + return nil unless driver_name + @driver = yast_config.drivers.find { |d| d.name == driver_name } end # sets kernel module for interface + # @param value [Driver] def driver=(value) - # TODO: new backend @driver = value end - # gets specific options for kernel driver - def driver_options - target_driver = @driver - target_driver = hwinfo.module if target_driver.empty? - # TODO: new backend - @driver_options ||= Yast::LanItems.driver_options[target_driver] || "" - end - - # sets specific options for kernel driver - def driver_options=(value) - # TODO: new backend - @driver_options = value - end - # gets aliases for interface # @return [Array] hash values are `:label` for alias label, # `:ip` for ip address, `:mask` for netmask and `:prefixlen` for prefix. diff --git a/src/lib/y2network/physical_interface.rb b/src/lib/y2network/physical_interface.rb index 7fe0363d6..4f8d75b44 100644 --- a/src/lib/y2network/physical_interface.rb +++ b/src/lib/y2network/physical_interface.rb @@ -52,6 +52,13 @@ def modalias @hardware.modalias end + # Returns the name of the current driver + # + # @return [String] + def current_driver + @hardware.module + end + # Determines whether the interface is present (attached) # # It relies in the hardware information diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 1f848be9d..340c1d73c 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -62,20 +62,36 @@ end describe "#save" do - around do |block| - Yast::LanItems.AddNew - # FIXME: workaround for device without reading hwinfo, so udev is not initialized - Yast::LanItems.Items[Yast::LanItems.current]["udev"] = {} - block.call - Yast::LanItems.Rollback - end + let(:driver) { Y2Network::Driver.new("virtio_net", "csum=1") } it "stores driver configuration" do - subject.driver = "e1000e" - subject.driver_options = "test" + expect(config).to receive(:add_or_update_driver).with(driver) + subject.driver = driver subject.save - expect(Yast::LanItems.Items[Yast::LanItems.current]["udev"]["driver"]).to eq "e1000e" - expect(Yast::LanItems.driver_options["e1000e"]).to eq "test" + end + + context "when the selected driver is different from the current one" do + before do + allow(eth0).to receive(:current_driver).and_return("e1000") + end + + it "sets the interface driver" do + expect(eth0).to receive(:custom_driver=).with(driver.name) + config_builder.driver = driver + subject.save + end + end + + context "when the selected driver is the same than the current one" do + before do + allow(eth0).to receive(:current_driver).and_return("virtio_net") + end + + it "sets the interface driver" do + expect(eth0).to_not receive(:custom_driver=) + config_builder.driver = driver + subject.save + end end it "saves connection config" do @@ -90,7 +106,7 @@ end it "updates the name in the configuration" do - expect(Yast::Lan.yast_config).to receive(:rename_interface) + expect(config).to receive(:rename_interface) .with("eth0", "eth2", :mac) subject.save end @@ -98,7 +114,7 @@ context "when interface was not renamed" do it "does not alter the name" do - expect(Yast::Lan.yast_config).to_not receive(:rename_interface) + expect(config).to_not receive(:rename_interface) subject.save end end From 49318a7e68738b18f8631a544489f8ef2b17b50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 12 Sep 2019 23:55:21 +0100 Subject: [PATCH 372/471] Add a widget to select the driver and its options --- src/lib/y2network/widgets/driver.rb | 87 ++++++++++++++++++++ src/lib/y2network/widgets/hardware_tab.rb | 20 +---- src/lib/y2network/widgets/kernel_module.rb | 22 ++--- src/lib/y2network/widgets/kernel_options.rb | 14 ++-- test/y2network/widgets/driver_test.rb | 55 +++++++++++++ test/y2network/widgets/kernel_module_test.rb | 6 +- 6 files changed, 162 insertions(+), 42 deletions(-) create mode 100644 src/lib/y2network/widgets/driver.rb create mode 100644 test/y2network/widgets/driver_test.rb diff --git a/src/lib/y2network/widgets/driver.rb b/src/lib/y2network/widgets/driver.rb new file mode 100644 index 000000000..105801359 --- /dev/null +++ b/src/lib/y2network/widgets/driver.rb @@ -0,0 +1,87 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "cwm" +require "y2network/widgets/kernel_module" +require "y2network/widgets/kernel_options" + +module Y2Network + module Widgets + # Widget to select the driver and to specify its options + class Driver < CWM::CustomWidget + include Yast::Logger + + def initialize(builder) + textdomain "network" + @builder = builder + self.handle_all_events = true + end + + def contents + Frame( + _("&Kernel Module"), + HBox( + HSpacing(0.5), + VBox( + VSpacing(0.4), + HBox( + kernel_module_widget, + HSpacing(0.5), + kernel_options_widget + ), + VSpacing(0.4) + ), + HSpacing(0.5) + ) + ) + end + + def handle(event) + return unless event["ID"] == "kernel_module" && event["EventReason"] == "ValueChanged" + return nil if @old_kernel_module == kernel_module_widget.value + + new_driver = @builder.drivers.find { |d| d.name == kernel_module_widget.value } + kernel_options_widget.value = new_driver.params if new_driver + @old_kernel_module = kernel_module_widget.value + + nil + end + + def store + @builder.driver = Y2Network::Driver.new(kernel_module_widget.value, kernel_options_widget.value) + end + + private + + def kernel_module_widget + return @kernel_module_width if @kernel_module_width + drivers_names = @builder.drivers.map(&:name) + selected_driver = @builder.driver.name if @builder.driver + @kernel_module_widget = KernelModule.new(drivers_names, selected_driver) + end + + def kernel_options_widget + return @kernel_options_widget if @kernel_options_widget + options = @builder.driver ? @builder.driver.params : "" + @kernel_options_widget ||= KernelOptions.new(options) + end + end + end +end diff --git a/src/lib/y2network/widgets/hardware_tab.rb b/src/lib/y2network/widgets/hardware_tab.rb index 529db0875..b92017f5e 100644 --- a/src/lib/y2network/widgets/hardware_tab.rb +++ b/src/lib/y2network/widgets/hardware_tab.rb @@ -22,8 +22,7 @@ # used widgets require "y2network/widgets/blink_button" -require "y2network/widgets/kernel_module" -require "y2network/widgets/kernel_options" +require "y2network/widgets/driver" require "y2network/widgets/ethtools_options" module Y2Network @@ -43,22 +42,7 @@ def contents VBox( # FIXME: ensure that only eth, maybe also ib? eth? ? BlinkButton.new(@settings) : Empty(), - Frame( - _("&Kernel Module"), - HBox( - HSpacing(0.5), - VBox( - VSpacing(0.4), - HBox( - KernelModule.new(@settings), - HSpacing(0.5), - KernelOptions.new(@settings) - ), - VSpacing(0.4) - ), - HSpacing(0.5) - ) - ), + Driver.new(@settings), # FIXME: probably makes sense only for eth EthtoolsOptions.new(@settings), VStretch() diff --git a/src/lib/y2network/widgets/kernel_module.rb b/src/lib/y2network/widgets/kernel_module.rb index c5ff44766..ea5d43617 100644 --- a/src/lib/y2network/widgets/kernel_module.rb +++ b/src/lib/y2network/widgets/kernel_module.rb @@ -24,9 +24,15 @@ module Y2Network module Widgets class KernelModule < CWM::ComboBox - def initialize(settings) + # Constructor + # + # @param names [Array] Drivers names + # @param selected [String,nil] Initially selected driver (nil if no driver is selected) + def initialize(names, selected) textdomain "network" - @settings = settings + @names = names + @selected = selected + self.widget_id = "kernel_module" end def label @@ -40,21 +46,15 @@ def help end def opt - [:editable] + [:editable, :notify] end def items - @settings.kernel_modules.map do |i| - [i, i] - end + @names.map { |n| [n, n] } end def init - self.value = @settings.driver unless @settings.driver.empty? - end - - def store - @settings.driver = value + self.value = @selected if @selected end end end diff --git a/src/lib/y2network/widgets/kernel_options.rb b/src/lib/y2network/widgets/kernel_options.rb index 3cf094c24..5a7550321 100644 --- a/src/lib/y2network/widgets/kernel_options.rb +++ b/src/lib/y2network/widgets/kernel_options.rb @@ -25,10 +25,12 @@ module Y2Network module Widgets class KernelOptions < CWM::InputField - def initialize(settings) + # Constructor + # + # @param options [String] Driver options + def initialize(options) textdomain "network" - - @settings = settings + @options = options end def label @@ -48,11 +50,7 @@ def opt end def init - self.value = @settings.driver_options - end - - def store - @settings.driver_options = value + self.value = @options end end end diff --git a/test/y2network/widgets/driver_test.rb b/test/y2network/widgets/driver_test.rb new file mode 100644 index 000000000..aa5632c36 --- /dev/null +++ b/test/y2network/widgets/driver_test.rb @@ -0,0 +1,55 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/widgets/driver" + +describe Y2Network::Widgets::Driver do + subject(:widget) { described_class.new(builder) } + + let(:builder) do + Y2Network::InterfaceConfigBuilder.for("eth") + end + let(:virtio_net) { Y2Network::Driver.new("virtio_net", "csum=1") } + + before do + allow(builder).to receive(:drivers).and_return([virtio_net]) + allow(builder).to receive(:driver).and_return(virtio_net) + end + + include_examples "CWM::CustomWidget" + + describe "#contents" do + it "contains a kernel module widget" do + expect(Y2Network::Widgets::KernelModule).to receive(:new) + .with(["virtio_net"], "virtio_net") + widget.contents + end + + it "contains a kernel options widget" do + expect(Y2Network::Widgets::KernelOptions).to receive(:new) + .with("csum=1") + widget.contents + end + end + + describe "#handle" +end diff --git a/test/y2network/widgets/kernel_module_test.rb b/test/y2network/widgets/kernel_module_test.rb index b3389aba3..b415d1608 100644 --- a/test/y2network/widgets/kernel_module_test.rb +++ b/test/y2network/widgets/kernel_module_test.rb @@ -21,13 +21,9 @@ require "cwm/rspec" require "y2network/widgets/kernel_module" -require "y2network/interface_config_builder" describe Y2Network::Widgets::KernelModule do - let(:builder) do - Y2Network::InterfaceConfigBuilder.for("eth") - end - subject { described_class.new(builder) } + subject { described_class.new(["virtio_net"], "virtio_net") } include_examples "CWM::ComboBox" end From 1b0f95d3659a657b8bd0699df7dcf6a560c0d5a1 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 13 Sep 2019 09:33:20 +0200 Subject: [PATCH 373/471] fix duplicite interfaces and changes from review --- src/lib/y2network/autoinst/interfaces_reader.rb | 1 + src/lib/y2network/autoinst/udev_rules_reader.rb | 12 +++++++++++- .../y2network/autoinst_profile/udev_rule_section.rb | 1 + .../y2network/autoinst_profile/udev_rules_section.rb | 3 ++- src/lib/y2network/config.rb | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index f2585cbe3..e46ff1fec 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -79,6 +79,7 @@ def create_config(interface_section) def load_generic(config, interface_section) config.bootproto = BootProtocol.from_name(interface_section.bootproto) config.name = interface_section.name || interface_section.device # device is just fallback + config.interface = config.name # in autoyast name and interface is same if config.bootproto == BootProtocol::STATIC # TODO: report if ipaddr missing for static config ipaddr = IPAddress.from_string(interface_section.ipaddr) diff --git a/src/lib/y2network/autoinst/udev_rules_reader.rb b/src/lib/y2network/autoinst/udev_rules_reader.rb index ab9a3bc43..9eeaf6321 100644 --- a/src/lib/y2network/autoinst/udev_rules_reader.rb +++ b/src/lib/y2network/autoinst/udev_rules_reader.rb @@ -23,7 +23,7 @@ module Y2Network module Autoinst # This class is responsible of importing the AutoYast udev rules section - # It is a bit different then other readers as it does not produce its config, + # It is a bit different than other readers as it does not produce its config, # but instead it is applied on top of current config by applying proper names # for interfaces or creating new ones. class UdevRulesReader @@ -53,6 +53,8 @@ def apply(config) private # find according to udev rule interface that match given hardware specification or nil if not exist + # @param config [Config] + # @param udev_rule [AutoinstSection::UdevRuleSection] def interface_for(config, udev_rule) config.interfaces.find do |interface| next unless interface.hardware @@ -62,6 +64,9 @@ def interface_for(config, udev_rule) end end + # @param config [Config] + # @param target_interface [Interface] + # @param udev_rule [AutoinstSection::UdevRuleSection] def rename_interface(config, target_interface, udev_rule) solve_collision(config, target_interface, udev_rule) @@ -69,10 +74,15 @@ def rename_interface(config, target_interface, udev_rule) config.rename_interface(old_name, udev_rule.name, udev_rule.mechanism) end + # @param _config [Config] + # @param udev_rule [AutoinstSection::UdevRuleSection] def create_interface(_config, udev_rule) log.error "Cannot find interface to apply udev rule #{udev_rule.inspect}. Skipping ..." end + # @param config [Config] + # @param target_interface [Interface] + # @param udev_rule [AutoinstSection::UdevRuleSection] def solve_collision(config, target_interface, udev_rule) existing_interface = config.interfaces.by_name(udev_rule.name) return unless existing_interface diff --git a/src/lib/y2network/autoinst_profile/udev_rule_section.rb b/src/lib/y2network/autoinst_profile/udev_rule_section.rb index 9e9c55fcd..ce2e7eb7f 100644 --- a/src/lib/y2network/autoinst_profile/udev_rule_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rule_section.rb @@ -97,6 +97,7 @@ def init_from_config(interface) end # helper to get mechanism symbol from rule + # @return [Symbol] mechanism corresponding to {Interface#rename_mechanism} def mechanism RULE_MAPPING.each_pair { |k, v| return k if v == rule } end diff --git a/src/lib/y2network/autoinst_profile/udev_rules_section.rb b/src/lib/y2network/autoinst_profile/udev_rules_section.rb index 567ff5b4a..017c6a45a 100644 --- a/src/lib/y2network/autoinst_profile/udev_rules_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rules_section.rb @@ -69,7 +69,7 @@ def init_from_hashes(hash) @udev_rules = udev_rules_from_hash(hash) end - # Method used by {.new_from_network} to populate the attributes when cloning routing settings + # Method used by {.new_from_network} to populate the attributes when cloning udev rules settings # # @param interfaces [Y2Network::InterfacesCollection] Network settings def init_from_network(interfaces) @@ -89,6 +89,7 @@ def udev_rules_from_hash(hash) end end + # @param interfaces [Y2Network::InterfacesCollection] interfaces to detect udev rules def udev_rules_section(interfaces) result = interfaces .map { |i| Y2Network::AutoinstProfile::UdevRuleSection.new_from_network(i) } diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 3c630cdcf..e261ce1c5 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -162,6 +162,7 @@ def add_or_update_connection_config(connection_config) connections.add_or_update(connection_config) interface = interfaces.by_name(connection_config.interface) return if interface + log.info "Creating new interface" interfaces << Interface.from_connection(connection_config) end From 81524bc98ec477bbc1fb76587bd71bf197b2ab7f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 13 Sep 2019 10:05:06 +0200 Subject: [PATCH 374/471] add test for reader --- .../y2network/autoinst/udev_rules_reader.rb | 2 +- .../autoinst_profile/udev_rule_section.rb | 2 +- .../autoinst/udev_rules_reader_test.rb | 82 +++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 test/y2network/autoinst/udev_rules_reader_test.rb diff --git a/src/lib/y2network/autoinst/udev_rules_reader.rb b/src/lib/y2network/autoinst/udev_rules_reader.rb index 9eeaf6321..deda9ca28 100644 --- a/src/lib/y2network/autoinst/udev_rules_reader.rb +++ b/src/lib/y2network/autoinst/udev_rules_reader.rb @@ -89,7 +89,7 @@ def solve_collision(config, target_interface, udev_rule) return if existing_interface == target_interface prefix = existing_interface.name[/\A(.*[^\d])\d+\z/, 1] - new_name = config.interfaces.new_name(prefix) + new_name = config.interfaces.free_name(prefix) # TODO: what mechanism should be default? config.rename_interface(existing_interface.name, new_name, :mac) diff --git a/src/lib/y2network/autoinst_profile/udev_rule_section.rb b/src/lib/y2network/autoinst_profile/udev_rule_section.rb index ce2e7eb7f..cefbcfee2 100644 --- a/src/lib/y2network/autoinst_profile/udev_rule_section.rb +++ b/src/lib/y2network/autoinst_profile/udev_rule_section.rb @@ -97,7 +97,7 @@ def init_from_config(interface) end # helper to get mechanism symbol from rule - # @return [Symbol] mechanism corresponding to {Interface#rename_mechanism} + # @return [Symbol] mechanism corresponding to {Interface#renaming_mechanism} def mechanism RULE_MAPPING.each_pair { |k, v| return k if v == rule } end diff --git a/test/y2network/autoinst/udev_rules_reader_test.rb b/test/y2network/autoinst/udev_rules_reader_test.rb new file mode 100644 index 000000000..94cce4ea6 --- /dev/null +++ b/test/y2network/autoinst/udev_rules_reader_test.rb @@ -0,0 +1,82 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/autoinst_profile/udev_rules_section" +require "y2network/autoinst/udev_rules_reader" +require "y2network/interface" + +describe Y2Network::Autoinst::UdevRulesReader do + let(:subject) { described_class.new(udev_rules_section) } + let(:udev_rules_section) do + Y2Network::AutoinstProfile::UdevRulesSection.new_from_hashes(udev_rules_profile) + end + + let(:udev_rules_profile) do + [ + { + "name" => "eth1", + "rule" => "KERNELS", + "value" => "bus1" + } + ] + end + + describe "#apply" do + let(:config) do + double(interfaces: Y2Network::InterfacesCollection.new([double(name: "eth0", hardware: double(busid: "bus1"))]), rename_interface: nil) + end + + it "renames interface with matching hardware properties" do + expect(config).to receive(:rename_interface).with("eth0", "eth1", :bus_id) + subject.apply(config) + end + + context "when there is already interface with matching name and non-matching hardware" do + let(:config) do + double( + interfaces: Y2Network::InterfacesCollection.new( + [ + double(name: "eth0", hardware: double(busid: "bus1")), + double(name: "eth1", hardware: double(busid: "bus2")) + ] + ), + rename_interface: nil + ) + end + + it "renames colliding interface to new free name" do + expect(config).to receive(:rename_interface).with("eth1", "eth2", :mac) + subject.apply(config) + end + end + + context "when there is no interface with matching hardware" do + let(:config) do + double(interfaces: Y2Network::InterfacesCollection.new([double(name: "eth0", hardware: double(busid: "bus2"))]), rename_interface: nil) + end + + it "do nothing" do + expect(config).to_not receive(:rename_interface) + end + end + end +end From 5e1e91896f9cdd44c4a834e03a950842df87e7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 09:11:12 +0100 Subject: [PATCH 375/471] Consider the custom driver as a valid option --- src/lib/y2network/config.rb | 1 + src/lib/y2network/interfaces_collection.rb | 7 +++++++ src/lib/y2network/sysconfig/interfaces_reader.rb | 10 ++++------ test/y2network/config_test.rb | 14 +++++++++++++- test/y2network/interfaces_collection_test.rb | 6 ++++++ 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index e2c7d4c28..927e3d202 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -173,6 +173,7 @@ def add_or_update_connection_config(connection_config) def drivers_for_interface(name) interface = interfaces.by_name(name) names = interface.drivers.map(&:name) + names << interface.custom_driver if interface.custom_driver && !names.include?(interface.custom_driver) drivers.select { |d| names.include?(d.name) } end diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index dec0031e3..8c53d89f3 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -76,6 +76,13 @@ def by_type(type) InterfacesCollection.new(interfaces.select { |i| i.type == type }) end + # Returns the list of physical interfaces + # + # @return [InterfacesCollection] List of physical interfaces + def physical + interfaces.select { |i| i.is_a?(PhysicalInterface) } + end + # Deletes elements which meet a given condition # # @return [InterfacesCollection] diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index ca9e770a9..58e55b848 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -102,12 +102,10 @@ def find_connections # Finds the available drivers def find_drivers - drivers_names = - @interfaces - .select { |i| i.is_a?(Y2Network::PhysicalInterface) } - .flat_map(&:drivers) - .map(&:name) - .uniq + physical_interfaces = @interfaces.physical + drivers_names = physical_interfaces.flat_map(&:drivers).map(&:name) + drivers_names += @interfaces.physical.map(&:custom_driver).compact + drivers_names.uniq! @drivers = drivers_names.map do |name| Y2Network::Driver.from_system(name) diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 44723551d..ad1ced2bd 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -323,7 +323,8 @@ describe "#drivers_for_interface" do let(:e1000) { Y2Network::Driver.new("e1000", "") } - let(:drivers) { [virtio_net, e1000] } + let(:custom) { Y2Network::Driver.new("custom", "") } + let(:drivers) { [virtio_net, e1000, custom] } before do allow(eth0).to receive(:drivers).and_return([Y2Network::Driver.new("virtio_net")]) @@ -333,6 +334,17 @@ drivers = config.drivers_for_interface("eth0") expect(drivers).to eq([virtio_net]) end + + context "when a custom driver is set" do + before do + eth0.custom_driver = custom.name + end + + it "includes the custom driver" do + expect(config.drivers_for_interface("eth0")) + .to include(custom) + end + end end describe "#add_or_update_driver" do diff --git a/test/y2network/interfaces_collection_test.rb b/test/y2network/interfaces_collection_test.rb index 7a9c0cddc..d16fc4262 100644 --- a/test/y2network/interfaces_collection_test.rb +++ b/test/y2network/interfaces_collection_test.rb @@ -92,6 +92,12 @@ end end + describe "#physical" do + it "returns only physical interfaces" do + expect(collection.physical.map(&:name)).to eq(["eth0", "wlan0"]) + end + end + describe "#known_names" do it "returns the list of known interfaces" do expect(collection.known_names).to eq(["eth0", "br0", "wlan0"]) From 7ccc6067c99de91d719f1cddc2a102de8c37ff60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 09:32:58 +0100 Subject: [PATCH 376/471] Fix API documentation --- src/lib/y2network/sysconfig/interfaces_reader.rb | 2 +- src/lib/y2network/udev_rule.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 58e55b848..40a072eed 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -143,7 +143,7 @@ def add_interface(conn) # Detects the renaming mechanism used by the interface # - # @param name [PhysicalInterface] Interface + # @param iface [PhysicalInterface] Interface # @return [Symbol] :mac (MAC address), :bus_id (BUS ID) or :none (no renaming) def renaming_mechanism_for(iface) rule = UdevRule.find_for(iface.name) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 0246411fe..4c1241c7b 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -31,10 +31,10 @@ module Y2Network # * 79-yast2-drivers.rules ('drivers' group): rules to assign drivers to interfaces. # # This class offers a set of constructors to build different kinds of rules. - # See {#new_mac_based_rename}, {#new_bus_id_based_rename} and {#new_driver_assignment}. + # See {.new_mac_based_rename}, {.new_bus_id_based_rename} and {.new_driver_assignment}. # # When it comes to write rules to the filesystem, we decided to offer different methods to - # write to each file. See {#write_net_rules} and {#write_drivers_rules}. + # write to each file. See {.write_net_rules} and {.write_drivers_rules}. # # @example Create a rule containing some key/value pairs (rule part) # rule = Y2Network::UdevRule.new( @@ -53,7 +53,6 @@ module Y2Network # # @example Writing driver assignment rules # rule = UdevRule.new_driver_assignment("virtio:d00000001v00001AF4", "virtio_net") - # rule.to_s #=> "ENV{MODALIAS}==\"virtio:d00000001v00001AF4\", ENV{MODALIAS}=\"e1000\"" # UdevRule.write_drivers_rules([rule]) # class UdevRule From a59f36191d2ee283e5cdd77f17748f8233af4f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 09:55:29 +0100 Subject: [PATCH 377/471] More API documentation fixes --- src/lib/y2network/udev_rule.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 4c1241c7b..58c7bced2 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -146,7 +146,7 @@ def write_net_rules(udev_rules) # Writes drivers specific udev rules to the filesystem # - # Those roles that does not have an "ENV{MODALIAS}=\"xxx\"" part will be ignored. + # Those rules that does not have an MODALIAS part will be ignored. # # @param udev_rules [Array] List of udev rules def write_drivers_rules(udev_rules) From 48c41fda9affbe003bfdb87b9e14a0a38d4d680b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 11:02:07 +0100 Subject: [PATCH 378/471] Updates from code review --- src/lib/y2network/driver.rb | 5 +++- src/lib/y2network/hwinfo.rb | 6 ++--- .../y2network/sysconfig/interfaces_reader.rb | 2 +- .../y2network/sysconfig/interfaces_writer.rb | 2 +- src/lib/y2network/udev_rule.rb | 25 +++++++++++++++---- src/lib/y2network/widgets/driver.rb | 2 +- .../sysconfig/interfaces_writer_test.rb | 2 +- test/y2network/udev_rule_test.rb | 12 +++++---- 8 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/lib/y2network/driver.rb b/src/lib/y2network/driver.rb index d53f32dac..ae514f9c2 100644 --- a/src/lib/y2network/driver.rb +++ b/src/lib/y2network/driver.rb @@ -18,12 +18,15 @@ # find current contact information at www.suse.com. require "yast" +require "y2network/can_be_copied" module Y2Network # This class represents a driver for an interface # # It is composed of a kernel module name and a string representing the module options class Driver + include CanBeCopied + class << self # Returns a driver using the information from the system # @@ -76,7 +79,7 @@ def ==(other) # is called. The reason is that writing them is an expensive operation, so it is # better to write parameters for all drivers at the same time. # - # You might prefer to use Y2Network::Driver.write_options instead. + # You might prefer to use {.write_options} instead. # # @see Y2Network::Driver.commit def write_options diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index a8621b8ce..90e53dafc 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -233,9 +233,9 @@ def merge!(other) # # @return [Array] List of drivers def drivers - drivers_list = @hwinfo.fetch("drivers", []) - return [] unless drivers_list[0] - modules = drivers_list[0].fetch("modules", []) + driver = @hwinfo.fetch("drivers", []).first + return [] unless driver + modules = driver.fetch("modules", []) modules.map { |m| Driver.new(*m) } end diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/sysconfig/interfaces_reader.rb index 40a072eed..bece0eb80 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/sysconfig/interfaces_reader.rb @@ -165,7 +165,7 @@ def renaming_mechanism_for(iface) # @return [String,nil] Custom driver (or nil if not set) def custom_driver_for(iface) return nil unless iface.modalias - rule = UdevRule.all(:drivers).find { |r| r.original_modalias == iface.modalias } + rule = UdevRule.drivers_rules.find { |r| r.original_modalias == iface.modalias } rule ? rule.driver : nil end end diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 35676e723..7c8a99487 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -78,7 +78,7 @@ def update_udevd(interfaces) def update_renaming_udev_rules(interfaces) udev_rules = interfaces.map { |i| renaming_udev_rule_for(i) }.compact known_names = interfaces.known_names - custom_rules = Y2Network::UdevRule.all(:net).reject { |u| known_names.include?(u.device) } + custom_rules = Y2Network::UdevRule.naming_rules.reject { |u| known_names.include?(u.device) } Y2Network::UdevRule.write_net_rules(custom_rules + udev_rules) end diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 58c7bced2..6a0a02992 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -60,9 +60,22 @@ class << self # Returns all persistent network rules # # @return [Array] Persistent network rules - def all(group = :net) - @all ||= {} - @all[group] ||= find_rules(group) + def all + naming_rules + drivers_rules + end + + # Returns naming rules + # + # @return [Array] Naming network rules + def naming_rules + find_rules(:net) + end + + # Returns driver rules + # + # @return [Array] Drivers rules + def drivers_rules + find_rules(:drivers) end # Returns the udev rule for a given device @@ -70,7 +83,7 @@ def all(group = :net) # @param device [String] Network device name # @return [UdevRule] udev rule def find_for(device) - all.find { |r| r.device == device } + naming_rules.find { |r| r.device == device } end # Helper method to create a rename rule based on a MAC address @@ -167,8 +180,10 @@ def reset_cache private def find_rules(group) + @all ||= {} + return @all[group] if @all[group] rules_map = Yast::SCR.Read(Yast::Path.new(".udev_persistent.#{group}")) || {} - rules_map.values.map do |parts| + @all[group] = rules_map.values.map do |parts| udev_parts = parts.map { |p| UdevRulePart.from_string(p) } new(udev_parts) end diff --git a/src/lib/y2network/widgets/driver.rb b/src/lib/y2network/widgets/driver.rb index 105801359..170c1ffae 100644 --- a/src/lib/y2network/widgets/driver.rb +++ b/src/lib/y2network/widgets/driver.rb @@ -71,7 +71,7 @@ def store private def kernel_module_widget - return @kernel_module_width if @kernel_module_width + return @kernel_module_widget if @kernel_module_widget drivers_names = @builder.drivers.map(&:name) selected_driver = @builder.driver.name if @builder.driver @kernel_module_widget = KernelModule.new(drivers_names, selected_driver) diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index 6abde6114..b6d49b292 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -127,7 +127,7 @@ let(:unknown_rule) { Y2Network::UdevRule.new_mac_based_rename("unknown", "00:11:22:33:44:55:66") } before do - allow(Y2Network::UdevRule).to receive(:all).and_return([unknown_rule]) + allow(Y2Network::UdevRule).to receive(:naming_rules).and_return([unknown_rule]) end it "keeps the rule" do diff --git a/test/y2network/udev_rule_test.rb b/test/y2network/udev_rule_test.rb index de679d63c..ec9f0d248 100644 --- a/test/y2network/udev_rule_test.rb +++ b/test/y2network/udev_rule_test.rb @@ -46,14 +46,16 @@ .and_return(udev_persistent_drivers) end - describe ".all" do - it "returns the rules from :net group" do - rules = described_class.all(:net) + describe ".naming_rules" do + it "returns naming rules" do + rules = described_class.naming_rules expect(rules.first.to_s).to match(/NAME=/) end + end - it "returns the rules from :drivers group" do - rules = described_class.all(:drivers) + describe ".drivers_rules" do + it "returns drivers rules" do + rules = described_class.drivers_rules expect(rules.first.to_s).to match(/MODALIAS/) end end From b23c09116f39f27f868c6ce1f03a3b8e39a7c1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 11:19:08 +0100 Subject: [PATCH 379/471] Documentation update --- src/lib/y2network/udev_rule.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/udev_rule.rb b/src/lib/y2network/udev_rule.rb index 6a0a02992..7552e561d 100644 --- a/src/lib/y2network/udev_rule.rb +++ b/src/lib/y2network/udev_rule.rb @@ -80,6 +80,8 @@ def drivers_rules # Returns the udev rule for a given device # + # Only the naming rules are considered. + # # @param device [String] Network device name # @return [UdevRule] udev rule def find_for(device) From 2a68482d6334f7b67877c2515903b6e20b6a14b5 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 13 Sep 2019 13:40:43 +0200 Subject: [PATCH 380/471] remove unused methods and convert few bites to new config --- src/lib/network/lan_items_summary.rb | 23 ----------------------- src/lib/y2network/interface.rb | 19 +------------------ src/modules/LanItems.rb | 4 ++-- test/lan_items_summary_test.rb | 17 ----------------- test/lan_test.rb | 1 + test/test_helper.rb | 1 + 6 files changed, 5 insertions(+), 60 deletions(-) diff --git a/src/lib/network/lan_items_summary.rb b/src/lib/network/lan_items_summary.rb index f68eca529..b6753a64d 100644 --- a/src/lib/network/lan_items_summary.rb +++ b/src/lib/network/lan_items_summary.rb @@ -33,29 +33,6 @@ def initialize Yast.import "Summary" end - # Generates a summary in RichText format for the configured interfaces - # - # @example - # LanItemsSummary.new.default - # => "

    • eth0
      DHCP

    • eth1
      NONE

    " - # - # @see Summary - # @return [String] summary in RichText - def default - items = [] - - LanItems.Items.each do |item, conf| - next if !Yast::LanItems.IsItemConfigured(item) - - ifcfg = LanItems.GetDeviceMap(item) || {} - items << Summary.Device(conf["ifcfg"], ifcfg_protocol(ifcfg)) - end - - return Summary.NotConfigured if items.empty? - - Summary.DevicesList(items) - end - # Generates a summary in RichText format for the configured interfaces # # @example diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 1898ba3aa..513816bd1 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -66,23 +66,6 @@ def from_connection(conn) end end - # Shortcuts for accessing interfaces' ifcfg options - # - # TODO: this makes Interface class tighly coupled with netconfig (sysconfig) backend - # once we have generic layer for accessing backends these methods has to be replaced - ["STARTMODE", "BOOTPROTO"].each do |ifcfg_option| - method_name = ifcfg_option.downcase - - define_method method_name do - # when switching to new backend we need as much guards as possible - if !configured || config.nil? || config.empty? - raise "Trying to read configuration of an unconfigured interface #{@name}" - end - - config[ifcfg_option] - end - end - # Constructor # # @param name [String] Interface name (e.g., "eth0") @@ -139,7 +122,7 @@ def rename(new_name, mechanism) private def system_config(name) - Yast::NetworkInterfaces.devmap(name) + Yast::Lan.system_config.connections.by_name(name) end def init(name) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 9453d84ba..50467e76c 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1184,9 +1184,9 @@ def startmode_overview(item_id) # It supports differents types of summaries depending on the options[:type] # # @see LanItemsSummary - # @param type [Hash] summary options + # @param type [String,Symbol] summary options, supported "one-line" and "proposal" # @return [String] summary of the configured items - def summary(type = "default") + def summary(type) LanItemsSummary.new.send(type) end diff --git a/test/lan_items_summary_test.rb b/test/lan_items_summary_test.rb index 59fccf487..dd2e5d70e 100755 --- a/test/lan_items_summary_test.rb +++ b/test/lan_items_summary_test.rb @@ -61,23 +61,6 @@ .and_return(instance_double(Y2Network::Config, interfaces: interfaces)) end - describe "#default" do - it "returns a Richtext summary of the configured interfaces" do - expect(subject.default) - .to eql "
      " \ - "

    • eth0
      DHCP

      • " \ - "

    • eth1
      NONE

      • " \ - "

    • br0
      STATIC

      • " \ - "
    " - end - - it "returns Summary.NotConfigured in case of not configured interfaces" do - allow(Yast::LanItems).to receive(:IsItemConfigured).and_return(false) - - expect(subject.default).to eql Yast::Summary.NotConfigured - end - end - describe "#proposal" do let(:interfaces) { instance_double(Y2Network::InterfacesCollection) } let(:br0) { instance_double(Y2Network::Interface, name: "br0", type: Y2Network::InterfaceType::BRIDGE) } diff --git a/test/lan_test.rb b/test/lan_test.rb index cfda96d60..11d45b334 100755 --- a/test/lan_test.rb +++ b/test/lan_test.rb @@ -34,6 +34,7 @@ before do Yast::Lan.clear_configs + allow(Yast::Lan).to receive(:system_config).and_call_original end describe "#Packages" do diff --git a/test/test_helper.rb b/test/test_helper.rb index 03ab2704e..482d2a893 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -64,6 +64,7 @@ Yast::Lan.clear_configs allow(Yast::NetworkInterfaces).to receive(:Write) allow(Y2Network::Hwinfo).to receive(:hwinfo_from_hardware) + allow(Yast::Lan).to receive(:system_config).and_return(Y2Network::Config.new(source: :testing)) end end From 1875b693cd13c31f9e53da0b787c74148828c600 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 13 Sep 2019 14:17:52 +0200 Subject: [PATCH 381/471] cleaning of lan items for unused code --- src/include/network/lan/address.rb | 89 ++------------- .../interface_config_builders/wireless.rb | 4 - src/modules/LanItems.rb | 101 ------------------ 3 files changed, 11 insertions(+), 183 deletions(-) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index f99de9d82..b1a29757f 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -41,11 +41,7 @@ def initialize_network_lan_address(include_target) textdomain "network" - Yast.import "Host" - Yast.import "Lan" - Yast.import "NetworkInterfaces" Yast.import "ProductFeatures" - Yast.import "String" Yast.include include_target, "network/lan/help.rb" Yast.include include_target, "network/lan/hardware.rb" @@ -68,33 +64,22 @@ def AddressDialog(builder:) log.info "ShowAndRun: #{ret}" if ret != :back && ret != :abort - bootproto = builder.boot_protocol - ipaddr = builder.ip_address - - # IP is mandatory for static configuration. Makes no sense to write static - # configuration without that. - return ret if bootproto == Y2Network::BootProtocol::STATIC && ipaddr.empty? - - if bootproto == Y2Network::BootProtocol::STATIC - update_hostname(ipaddr, builder.hostname || "") - elsif LanItems.isCurrentDHCP && !LanItems.isCurrentHotplug + if LanItems.isCurrentDHCP && !LanItems.isCurrentHotplug # fixed bug #73739 - if dhcp is used, dont set default gw statically # but also: reset default gw only if DHCP* is used, this branch covers # "No IP address" case, then default gw must stay (#460262) # and also: don't delete default GW for usb/pcmcia devices (#307102) - if LanItems.isCurrentDHCP && !LanItems.isCurrentHotplug - yast_config = Y2Network::Config.find(:yast) - if yast_config && yast_config.routing && yast_config.routing.default_route - remove_gw = Popup.YesNo( - _( - "A static default route is defined.\n" \ - "It is suggested to remove the static default route definition \n" \ - "if one can be obtained also via DHCP.\n" \ - "Do you want to remove the static default route?" - ) + yast_config = Y2Network::Config.find(:yast) + if yast_config && yast_config.routing && yast_config.routing.default_route + remove_gw = Popup.YesNo( + _( + "A static default route is defined.\n" \ + "It is suggested to remove the static default route definition \n" \ + "if one can be obtained also via DHCP.\n" \ + "Do you want to remove the static default route?" ) - yast_config.routing.remove_default_routes if remove_gw - end + ) + yast_config.routing.remove_default_routes if remove_gw end end end @@ -102,57 +87,5 @@ def AddressDialog(builder:) log.info "AddressDialog res: #{ret.inspect}" ret end - - private - - # Performs hostname update - # - # This handles ip and hostname change when editing NIC properties. - # The method relies on old NIC's IP which is set globally at initialization - # of NIC edit dialog (@see LanItems#ipaddr) - # - # When hostname is empty, then old IP's record is cleared from /etc/hosts and - # new is not created. - # Otherwise the canonical name and all aliases in the record - # are replaced by new ones. - # - # @param ipaddr [String] ip address - # @param hostname [String] new hostname - def update_hostname(ipaddr, hostname) - ip_changed = LanItems.ipaddr != ipaddr - initial_hostname = initial_hostname(LanItems.ipaddr) - hostname_changed = initial_hostname != hostname - - return if !(ip_changed || hostname_changed || hostname.empty?) - - # store old names, remove the record - names = Host.names(LanItems.ipaddr).first - Host.remove_ip(LanItems.ipaddr) - - if ip_changed && !hostname_changed && !names.nil? - log.info("Dropping record for #{LanItems.ipaddr} from /etc/hosts") - - Host.add_name(ipaddr, names) - end - if !hostname.empty? && hostname_changed - log.info("Updating cannonical name for #{LanItems.ipaddr} in /etc/hosts") - - Host.Update(initial_hostname, hostname, ipaddr) - end - - nil - end - - # Returns canonical hostname for the given ip - def initial_hostname(ipaddr) - host_list = Host.names(ipaddr) - if Ops.greater_than(Builtins.size(host_list), 1) - Builtins.y2milestone( - "More than one hostname for single IP detected, using the first one only" - ) - end - - String.FirstChunk(Ops.get(host_list, 0, ""), " \t") - end end end diff --git a/src/lib/y2network/interface_config_builders/wireless.rb b/src/lib/y2network/interface_config_builders/wireless.rb index 5776188fc..d22e01d5f 100644 --- a/src/lib/y2network/interface_config_builders/wireless.rb +++ b/src/lib/y2network/interface_config_builders/wireless.rb @@ -34,10 +34,6 @@ def initialize(config: nil) super(type: InterfaceType::WIRELESS, config: config) end - def auth_modes - Yast::LanItems.wl_auth_modes - end - def access_point @connection_config.ap end diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 50467e76c..8ecee334a 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -99,69 +99,6 @@ def main @Requires = [] - # address options - # boot protocol: BOOTPROTO - @bootproto = "static" - @ipaddr = "" - @netmask = "" - @prefix = "" - - @startmode = "auto" - - # wireless options - @wl_mode = "" - @wl_essid = "" - @wl_nwid = "" - @wl_auth_mode = "" - # when adding another key, don't forget the chmod 600 in NetworkInterfaces - @wl_wpa_psk = "" - @wl_key_length = "" - @wl_key = [] - @wl_default_key = 0 - @wl_nick = "" - - # FIXME: We should unify bridge_ports and bond_slaves variables - - # interfaces attached to bridge (list delimited by ' ') - @bridge_ports = "" - - # bond options - @bond_slaves = [] - @bond_option = "" - - # VLAN option - @vlan_etherdevice = "" - - # wl_wpa_eap aggregates the settings in a map for easier CWM access. - # - # **Structure:** - # - # wpa_eap - # WPA_EAP_MODE: string ("TTLS" "PEAP" or "TLS") - # WPA_EAP_IDENTITY: string - # WPA_EAP_PASSWORD: string (for TTLS and PEAP) - # WPA_EAP_ANONID: string (for TTLS and PEAP) - # WPA_EAP_CLIENT_CERT: string (for TLS, file name) - # WPA_EAP_CLIENT_KEY: string (for TLS, file name) - # WPA_EAP_CLIENT_KEY_PASSWORD: string (for TLS) - # WPA_EAP_CA_CERT: string (file name) - # WPA_EAP_AUTH: string ("", "MD5", "GTC", "CHAP"*, "PAP"*, "MSCHAP"*, "MSCHAPV2") (*: TTLS only) - # WPA_EAP_PEAP_VERSION: string ("", "0", "1") - @wl_wpa_eap = {} - @wl_channel = "" - @wl_frequency = "" - @wl_bitrate = "" - @wl_accesspoint = "" - @wl_power = true - @wl_ap_scanmode = "" - - # Card Features from hwinfo - # if not provided, we use the default full list - @wl_auth_modes = nil - @wl_enc_modes = nil - @wl_channels = nil - @wl_bitrates = nil - # s390 options @qeth_portname = "" @qeth_portnumber = "" @@ -1399,15 +1336,6 @@ def SelectHWMap(hardware) # FIXME: devname @hotplug = "" - # Wireless Card Features - @wl_auth_modes = Builtins.prepend( - hardware["wl_auth_modes"], - "no-encryption" - ) - @wl_enc_modes = hardware["wl_enc_modes"] - @wl_channels = hardware["wl_channels"] - @wl_bitrates = hardware["wl_bitrates"] - Builtins.y2milestone("hw=%1", hardware) @hw = deep_copy(hardware) @@ -2204,36 +2132,7 @@ def yast_config publish_variable :hotplug, "string" # @attribute Requires publish_variable :Requires, "list " - publish_variable :bootproto, "string" - publish_variable :ipaddr, "string" - publish_variable :netmask, "string" publish_variable :set_default_route, "boolean" - publish_variable :prefix, "string" - publish_variable :startmode, "string" - publish_variable :wl_mode, "string" - publish_variable :wl_essid, "string" - publish_variable :wl_nwid, "string" - publish_variable :wl_auth_mode, "string" - publish_variable :wl_wpa_psk, "string" - publish_variable :wl_key_length, "string" - publish_variable :wl_key, "list " - publish_variable :wl_default_key, "integer" - publish_variable :wl_nick, "string" - publish_variable :bond_slaves, "list " - publish_variable :bond_option, "string" - publish_variable :vlan_etherdevice, "string" - publish_variable :bridge_ports, "string" - publish_variable :wl_wpa_eap, "map " - publish_variable :wl_channel, "string" - publish_variable :wl_frequency, "string" - publish_variable :wl_bitrate, "string" - publish_variable :wl_accesspoint, "string" - publish_variable :wl_power, "boolean" - publish_variable :wl_ap_scanmode, "string" - publish_variable :wl_auth_modes, "list " - publish_variable :wl_enc_modes, "list " - publish_variable :wl_channels, "list " - publish_variable :wl_bitrates, "list " publish_variable :qeth_portname, "string" publish_variable :qeth_portnumber, "string" publish_variable :chan_mode, "string" From 5a392c96736ab531dfa483b6e99f0af30cc052bd Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 13 Sep 2019 14:52:06 +0200 Subject: [PATCH 382/471] convert autoconfiguration --- src/lib/network/network_autoconfiguration.rb | 75 ++++++---------- test/address_test.rb | 90 -------------------- test/network_autoconfiguration_test.rb | 18 ++-- 3 files changed, 30 insertions(+), 153 deletions(-) delete mode 100755 test/address_test.rb diff --git a/src/lib/network/network_autoconfiguration.rb b/src/lib/network/network_autoconfiguration.rb index aec794f48..7b8c026f7 100644 --- a/src/lib/network/network_autoconfiguration.rb +++ b/src/lib/network/network_autoconfiguration.rb @@ -45,29 +45,31 @@ class NetworkAutoconfiguration # # returns [Boolean] true when at least one interface is active def any_iface_active? - network_cards.any? { |c| configured?(c) && active_config?(c) } + config.interfaces.any? { |c| config.connections.by_name(c.name) && active_config?(c.name) } end def configure_dhcp - Yast.include self, "network/routines.rb" + Yast::Lan.Read(:cache) + Yast.include self, "network/routines.rb" # TODO: needed only for phy_connected # find out network devices suitable for dhcp autoconfiguration. # Such device has to: # - be unconfigured # - physically connected to a network # (it speeds up the initialization phase of installer - bnc#872319) - dhcp_cards = network_cards.select do |c| - !configured?(c) && phy_connected?(c) + dhcp_cards = config.interfaces.select do |c| + next false if config.connections.by_name(c.name) + phy_connected?(c.name) end - log.info "Candidates for enabling DHCP: #{dhcp_cards}" + log.info "Candidates for enabling DHCP: #{dhcp_cards.inspect}" # TODO: time consuming, some progress would be nice dhcp_cards.each { |d| setup_dhcp(d) } - activate_changes(dhcp_cards) + activate_changes(dhcp_cards.map(&:name)) # drop devices without dhcp lease - inactive_devices = dhcp_cards.select { |c| !active_config?(c) } + inactive_devices = dhcp_cards.select { |c| !active_config?(c.name) } log.info "Inactive devices: #{inactive_devices}" inactive_devices.each { |c| delete_config(c) } @@ -82,10 +84,10 @@ def configure_dhcp # try to find just one dhcp aware device for allowing default route # if there is more than one dhcp devices enabled for setting default # route (DHCLIENT_SET_DEFAULT_ROUTE = "yes"). bnc#868187 - active_devices.find { |d| set_default_route_flag_if_wan_dev?(d) } + active_devices.find { |d| set_default_route_flag_if_wan_dev?(d.name) } end - activate_changes(dhcp_cards) + activate_changes(dhcp_cards.map(&:name)) end # Propose configuration for virtual devices @@ -126,49 +128,29 @@ def configure_hosts private - def network_cards - LanItems.Read - LanItems.GetNetcardNames - end - # Makes DHCP setup persistent # # instsys currently uses wicked as network services "manager" (including # dhcp client). wicked is currently able to configure a card for dhcp leases # only via loading config from file. All other ways are workarounds and # needn't to work when wickedd* services are already running + # @param card [Y2Network::Interface] def setup_dhcp(card) - index = LanItems.FindDeviceIndex(card) - - raise "Failed to save configuration for device #{card}" if index == -1 - - LanItems.current = index - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType()) - builder.name = LanItems.GetCurrentName() - - LanItems.SetItem(builder: builder) + builder.name = card.name - # tricky part if ifcfg is not set - # yes, this code smell and show bad API of LanItems - if !LanItems.IsCurrentConfigured - NetworkInterfaces.Add - current = LanItems.Items[LanItems.current] - current["ifcfg"] = card - end - - builder.boot_protocol = "dhcp" - builder.startmode = "auto" + builder.boot_protocol = Y2Network::BootProtocol::DHCP + builder.startmode = Y2Network::Startmode.create("auto") LanItems.Commit(builder) end - def delete_config(devname) - LanItems.delete_dev(devname) + def delete_config(interface) + config.delete_interface(interface.name) end def write_configuration - NetworkInterfaces.Write("") + config.write end # Writes and activates changes in devices configurations @@ -176,23 +158,11 @@ def write_configuration # @param devnames [Array] list of device names # @return true when changes were successfully applied def activate_changes(devnames) - return false if !write_configuration - - # workaround for gh#yast/yast-core#74 (https://github.com/yast/yast-core/issues/74) - NetworkInterfaces.CleanCacheRead() + write_configuration reload_config(devnames) end - def configured?(devname) - # TODO: one day there should be LanItems.IsItemConfigured, but we currently - # miss index -> devname translation. As this LanItems internal structure - # will be subject of refactoring, we will use NetworkInterfaces directly. - # It currently doesn't hurt as it currently writes configuration for both - # wicked even sysconfig. - NetworkInterfaces.Check(devname) - end - # Checks if given device is active # # active device <=> a device which is reported as "up" by wicked @@ -240,8 +210,7 @@ def set_default_route_flag_if_wan_dev?(devname) # @param [String] devname name of device as seen by system (e.g. enp0s3) # @param [String] value "yes" or "no", as in sysconfig def set_default_route_flag(devname, value) - item_id = LanItems.FindDeviceIndex(devname) - LanItems.SetItemSysconfigOpt(item_id, "DHCLIENT_SET_DEFAULT_ROUTE", value) + # TODO: not implemented end # Decides if a proposal for virtualization host machine is required. @@ -255,5 +224,9 @@ def virtual_proposal_required? false end + + def config + Yast::Lan.yast_config + end end end diff --git a/test/address_test.rb b/test/address_test.rb deleted file mode 100755 index 11cc4dfdb..000000000 --- a/test/address_test.rb +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env rspec -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -Yast.import "UI" - -class DummyClassForAddressTest < Yast::Module - def initialize - Yast.include self, "network/lan/address.rb" - end -end - -describe "NetworkLanAddressInclude" do - subject { DummyClassForAddressTest.new } - - describe "#update_hostname" do - let(:ip) { "1.1.1.1" } - let(:initial_hostname) { "initial.hostname.com" } - let(:new_hostname) { "new.hostname.com" } - - before(:each) do - allow(Yast::LanItems) - .to receive(:ipaddr) - .and_return(ip) - allow(subject) - .to receive(:initial_hostname) - .and_return(initial_hostname) - allow(Yast::Host) - .to receive(:names) - .and_call_original - allow(Yast::Host) - .to receive(:names) - .with(ip) - .and_return(["#{initial_hostname} custom-name"]) - end - - context "when ip has not changed" do - it "drops old /etc/hosts record if hostname was changed" do - expect(Yast::Host) - .to receive(:remove_ip) - .with(ip) - expect(Yast::Host) - .to receive(:Update) - .with(initial_hostname, new_hostname, ip) - - subject.send(:update_hostname, ip, new_hostname) - end - end - - context "when ip has changed" do - it "keeps names if there is no change in hostname" do - new_ip = "2.2.2.2" - - original_names = Yast::Host.names(ip) - subject.send(:update_hostname, new_ip, initial_hostname) - - expect(Yast::Host.names(new_ip)).to eql original_names - end - - it "does not crash when no hostnames exist for old ip and new hostname is not set" do - new_ip = "2.2.2.2" - - # targeted especially against newly created devices ;-) - allow(Yast::LanItems) - .to receive(:ipaddr) - .and_return("") - - expect { subject.send(:update_hostname, new_ip, "") }.not_to raise_error - end - end - end -end diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 8085b146d..2330f77d2 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -195,18 +195,12 @@ def probe_netcard_factory(num) let(:instance) { Yast::NetworkAutoconfiguration.instance } it "returns true if any of available interfaces has configuration and is up" do - allow(Yast::LanItems) - .to receive(:Read) - .and_return(true) - allow(Yast::LanItems) - .to receive(:GetNetcardNames) - .and_return([IFACE, "enp0s3", "br7"]) - allow(Yast::NetworkInterfaces) - .to receive(:adapt_old_config!) - allow(Yast::NetworkInterfaces) - .to receive(:Check) - .with(IFACE) - .and_return(true) + allow(Yast::Lan).to receive(:yast_config) + .and_return(Y2Network::Config.new( + interfaces: Y2Network::InterfacesCollection.new([double(name: IFACE)]), + connections: Y2Network::ConnectionConfigsCollection.new([double(name: IFACE)]), + source: :testing + )) allow(Yast::SCR) .to receive(:Execute) .and_return(0) From fce6655a34822a2f20eeba60fdfa24eb4f547a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 15:27:13 +0100 Subject: [PATCH 383/471] Allow to select no driver (auto) --- src/lib/y2network/driver.rb | 1 + src/lib/y2network/interface_config_builder.rb | 18 ++++++--- src/lib/y2network/widgets/driver.rb | 37 ++++++++++++++++--- src/lib/y2network/widgets/kernel_module.rb | 17 ++++++++- .../interface_config_builder_test.rb | 24 ++++++++---- test/y2network/widgets/driver_test.rb | 4 +- test/y2network/widgets/kernel_module_test.rb | 2 +- 7 files changed, 79 insertions(+), 24 deletions(-) diff --git a/src/lib/y2network/driver.rb b/src/lib/y2network/driver.rb index ae514f9c2..6bfcd33d1 100644 --- a/src/lib/y2network/driver.rb +++ b/src/lib/y2network/driver.rb @@ -70,6 +70,7 @@ def initialize(name, params = "") # @param other [Driver] Driver to compare with # @return [Boolean] def ==(other) + return false unless other.is_a?(Driver) name == other.name && params == other.params end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 7e274c41f..f03190a2e 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -126,9 +126,9 @@ def save firewall_interface.zone = firewall_zone if !firewall_interface.zone || firewall_zone != firewall_interface.zone.name end - if interface.respond_to?(:custom_driver) && driver - interface.custom_driver = driver.name if driver.name != interface.current_driver - yast_config.add_or_update_driver(driver) + if interface.respond_to?(:custom_driver) + interface.custom_driver = driver_auto? ? nil : driver.name + yast_config.add_or_update_driver(driver) unless driver_auto? end yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? yast_config.add_or_update_connection_config(@connection_config) @@ -243,9 +243,8 @@ def ifplugd_priority # gets currently assigned kernel module def driver return @driver if @driver - driver_name = @interface.custom_driver || @interface.current_driver - return nil unless driver_name - @driver = yast_config.drivers.find { |d| d.name == driver_name } + @driver = yast_config.drivers.find { |d| d.name == @interface.custom_driver } if @interface.custom_driver + @driver ||= :auto end # sets kernel module for interface @@ -461,5 +460,12 @@ def original_hostname names = Yast::Host.names(@original_ip_config.address.to_s) @original_hostname = names.first || "" end + + # Determines whether the driver should be set automatically + # + # @return [Boolean] + def driver_auto? + :auto == driver + end end end diff --git a/src/lib/y2network/widgets/driver.rb b/src/lib/y2network/widgets/driver.rb index 170c1ffae..8e814ec5f 100644 --- a/src/lib/y2network/widgets/driver.rb +++ b/src/lib/y2network/widgets/driver.rb @@ -53,19 +53,32 @@ def contents ) end + def init + disable_kernel_options if @builder.driver == :auto + end + def handle(event) return unless event["ID"] == "kernel_module" && event["EventReason"] == "ValueChanged" return nil if @old_kernel_module == kernel_module_widget.value - new_driver = @builder.drivers.find { |d| d.name == kernel_module_widget.value } - kernel_options_widget.value = new_driver.params if new_driver + if kernel_module_widget.value == :auto + disable_kernel_options + else + enable_kernel_options + end + @old_kernel_module = kernel_module_widget.value nil end def store - @builder.driver = Y2Network::Driver.new(kernel_module_widget.value, kernel_options_widget.value) + @builder.driver = + if kernel_module_widget.value == :auto + :auto + else + Y2Network::Driver.new(kernel_module_widget.value, kernel_options_widget.value) + end end private @@ -73,15 +86,27 @@ def store def kernel_module_widget return @kernel_module_widget if @kernel_module_widget drivers_names = @builder.drivers.map(&:name) - selected_driver = @builder.driver.name if @builder.driver - @kernel_module_widget = KernelModule.new(drivers_names, selected_driver) + selected_driver = @builder.driver.name if @builder.driver != :auto + current_driver = @builder.interface.current_driver if @builder.interface + @kernel_module_widget = KernelModule.new(drivers_names, selected_driver, current_driver) end def kernel_options_widget return @kernel_options_widget if @kernel_options_widget - options = @builder.driver ? @builder.driver.params : "" + options = @builder.driver != :auto ? @builder.driver.params : "" @kernel_options_widget ||= KernelOptions.new(options) end + + def disable_kernel_options + kernel_options_widget.value = "" + kernel_options_widget.disable + end + + def enable_kernel_options + new_driver = @builder.drivers.find { |d| d.name == kernel_module_widget.value } + kernel_options_widget.value = new_driver.params if new_driver + kernel_options_widget.enable + end end end end diff --git a/src/lib/y2network/widgets/kernel_module.rb b/src/lib/y2network/widgets/kernel_module.rb index ea5d43617..fa4eb21e4 100644 --- a/src/lib/y2network/widgets/kernel_module.rb +++ b/src/lib/y2network/widgets/kernel_module.rb @@ -28,10 +28,12 @@ class KernelModule < CWM::ComboBox # # @param names [Array] Drivers names # @param selected [String,nil] Initially selected driver (nil if no driver is selected) - def initialize(names, selected) + # @param current [String] Name of the module currently used by the kernel + def initialize(names, selected, current) textdomain "network" @names = names @selected = selected + @current = current self.widget_id = "kernel_module" end @@ -50,12 +52,23 @@ def opt end def items - @names.map { |n| [n, n] } + @items ||= [["yast_auto", auto_label]] + @names.map { |n| [n, n] } end def init self.value = @selected if @selected end + + def value + ret = super + ret == "yast_auto" ? :auto : ret + end + + private + + def auto_label + @current ? format(_("Auto (%s)"), @current) : _("Auto") + end end end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 340c1d73c..712ece0b4 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -70,26 +70,34 @@ subject.save end - context "when the selected driver is different from the current one" do + context "when a driver is selected" do before do - allow(eth0).to receive(:current_driver).and_return("e1000") + config_builder.driver = driver end it "sets the interface driver" do expect(eth0).to receive(:custom_driver=).with(driver.name) - config_builder.driver = driver + subject.save + end + + it "updates the driver" do + expect(config).to receive(:add_or_update_driver).with(driver) subject.save end end - context "when the selected driver is the same than the current one" do + context "when no driver is selected" do before do - allow(eth0).to receive(:current_driver).and_return("virtio_net") + config_builder.driver = :auto end - it "sets the interface driver" do - expect(eth0).to_not receive(:custom_driver=) - config_builder.driver = driver + it "sets the interface driver to nil" do + expect(eth0).to receive(:custom_driver=).with(nil) + subject.save + end + + it "does not update any driver" do + expect(config).to_not receive(:add_or_update_driver) subject.save end end diff --git a/test/y2network/widgets/driver_test.rb b/test/y2network/widgets/driver_test.rb index aa5632c36..c985e7eef 100644 --- a/test/y2network/widgets/driver_test.rb +++ b/test/y2network/widgets/driver_test.rb @@ -29,10 +29,12 @@ Y2Network::InterfaceConfigBuilder.for("eth") end let(:virtio_net) { Y2Network::Driver.new("virtio_net", "csum=1") } + let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } before do allow(builder).to receive(:drivers).and_return([virtio_net]) allow(builder).to receive(:driver).and_return(virtio_net) + allow(builder).to receive(:interface).and_return(eth0) end include_examples "CWM::CustomWidget" @@ -40,7 +42,7 @@ describe "#contents" do it "contains a kernel module widget" do expect(Y2Network::Widgets::KernelModule).to receive(:new) - .with(["virtio_net"], "virtio_net") + .with(["virtio_net"], "virtio_net", nil) widget.contents end diff --git a/test/y2network/widgets/kernel_module_test.rb b/test/y2network/widgets/kernel_module_test.rb index b415d1608..331c20197 100644 --- a/test/y2network/widgets/kernel_module_test.rb +++ b/test/y2network/widgets/kernel_module_test.rb @@ -23,7 +23,7 @@ require "y2network/widgets/kernel_module" describe Y2Network::Widgets::KernelModule do - subject { described_class.new(["virtio_net"], "virtio_net") } + subject { described_class.new(["virtio_net", "alt"], "virtio_net", "virtio_net") } include_examples "CWM::ComboBox" end From 788c6e9f77bc576a10a5d06259b16c5f50410769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Sun, 15 Sep 2019 22:22:15 +0100 Subject: [PATCH 384/471] Do not show the current driver in the "Auto" option --- src/lib/y2network/widgets/driver.rb | 3 +-- src/lib/y2network/widgets/kernel_module.rb | 12 ++---------- test/y2network/widgets/driver_test.rb | 2 +- test/y2network/widgets/kernel_module_test.rb | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/lib/y2network/widgets/driver.rb b/src/lib/y2network/widgets/driver.rb index 8e814ec5f..fa5a02c72 100644 --- a/src/lib/y2network/widgets/driver.rb +++ b/src/lib/y2network/widgets/driver.rb @@ -87,8 +87,7 @@ def kernel_module_widget return @kernel_module_widget if @kernel_module_widget drivers_names = @builder.drivers.map(&:name) selected_driver = @builder.driver.name if @builder.driver != :auto - current_driver = @builder.interface.current_driver if @builder.interface - @kernel_module_widget = KernelModule.new(drivers_names, selected_driver, current_driver) + @kernel_module_widget = KernelModule.new(drivers_names, selected_driver) end def kernel_options_widget diff --git a/src/lib/y2network/widgets/kernel_module.rb b/src/lib/y2network/widgets/kernel_module.rb index fa4eb21e4..4e9eee4ef 100644 --- a/src/lib/y2network/widgets/kernel_module.rb +++ b/src/lib/y2network/widgets/kernel_module.rb @@ -28,12 +28,10 @@ class KernelModule < CWM::ComboBox # # @param names [Array] Drivers names # @param selected [String,nil] Initially selected driver (nil if no driver is selected) - # @param current [String] Name of the module currently used by the kernel - def initialize(names, selected, current) + def initialize(names, selected) textdomain "network" @names = names @selected = selected - @current = current self.widget_id = "kernel_module" end @@ -52,7 +50,7 @@ def opt end def items - @items ||= [["yast_auto", auto_label]] + @names.map { |n| [n, n] } + @items ||= [["yast_auto", _("Auto")]] + @names.map { |n| [n, n] } end def init @@ -63,12 +61,6 @@ def value ret = super ret == "yast_auto" ? :auto : ret end - - private - - def auto_label - @current ? format(_("Auto (%s)"), @current) : _("Auto") - end end end end diff --git a/test/y2network/widgets/driver_test.rb b/test/y2network/widgets/driver_test.rb index c985e7eef..f2edc0a87 100644 --- a/test/y2network/widgets/driver_test.rb +++ b/test/y2network/widgets/driver_test.rb @@ -42,7 +42,7 @@ describe "#contents" do it "contains a kernel module widget" do expect(Y2Network::Widgets::KernelModule).to receive(:new) - .with(["virtio_net"], "virtio_net", nil) + .with(["virtio_net"], "virtio_net") widget.contents end diff --git a/test/y2network/widgets/kernel_module_test.rb b/test/y2network/widgets/kernel_module_test.rb index 331c20197..e7a4e07ec 100644 --- a/test/y2network/widgets/kernel_module_test.rb +++ b/test/y2network/widgets/kernel_module_test.rb @@ -23,7 +23,7 @@ require "y2network/widgets/kernel_module" describe Y2Network::Widgets::KernelModule do - subject { described_class.new(["virtio_net", "alt"], "virtio_net", "virtio_net") } + subject { described_class.new(["virtio_net", "alt"], "virtio_net") } include_examples "CWM::ComboBox" end From 6327d85e528160fee3b627a10f1c27a17517a6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Sun, 15 Sep 2019 22:23:21 +0100 Subject: [PATCH 385/471] Use an empty string as value for the "Auto" option --- src/lib/y2network/widgets/kernel_module.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/widgets/kernel_module.rb b/src/lib/y2network/widgets/kernel_module.rb index 4e9eee4ef..88a5340cd 100644 --- a/src/lib/y2network/widgets/kernel_module.rb +++ b/src/lib/y2network/widgets/kernel_module.rb @@ -50,7 +50,7 @@ def opt end def items - @items ||= [["yast_auto", _("Auto")]] + @names.map { |n| [n, n] } + @items ||= [["", _("Auto")]] + @names.map { |n| [n, n] } end def init @@ -59,7 +59,7 @@ def init def value ret = super - ret == "yast_auto" ? :auto : ret + ret == "" ? :auto : ret end end end From 90a542551d2f1befd3ff6d7475a80a32e22ecd5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 09:22:19 +0100 Subject: [PATCH 386/471] Update from code review --- src/lib/y2network/driver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/driver.rb b/src/lib/y2network/driver.rb index 6bfcd33d1..9321ddde8 100644 --- a/src/lib/y2network/driver.rb +++ b/src/lib/y2network/driver.rb @@ -67,8 +67,8 @@ def initialize(name, params = "") # Determines whether two drivers are equal # - # @param other [Driver] Driver to compare with - # @return [Boolean] + # @param other [Object] Driver to compare with + # @return [Boolean] true if +other+ is a Driver instance with the same name and params; false otherwise. def ==(other) return false unless other.is_a?(Driver) name == other.name && params == other.params From 4e0a75e588a480bcbe3d5b366e6a20eb65cc65bb Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 16 Sep 2019 10:22:49 +0200 Subject: [PATCH 387/471] enable some tests and mode code adapted --- src/include/network/lan/address.rb | 1 - src/include/network/lan/bridge.rb | 72 --------------- src/lib/network/network_autoconfiguration.rb | 4 +- .../y2network/autoinst/interfaces_reader.rb | 4 +- src/lib/y2network/connection_config/base.rb | 11 +++ src/lib/y2network/interface_config_builder.rb | 5 ++ .../interface_config_builders/bridge.rb | 3 +- src/modules/Lan.rb | 76 +++++----------- src/modules/LanItems.rb | 42 --------- test/lan_test.rb | 12 +-- test/network_autoconfiguration_test.rb | 88 ++++--------------- test/test_helper.rb | 3 + 12 files changed, 69 insertions(+), 252 deletions(-) delete mode 100644 src/include/network/lan/bridge.rb diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index b1a29757f..b994a692a 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -46,7 +46,6 @@ def initialize_network_lan_address(include_target) Yast.include include_target, "network/lan/help.rb" Yast.include include_target, "network/lan/hardware.rb" Yast.include include_target, "network/complex.rb" - Yast.include include_target, "network/lan/bridge.rb" Yast.include include_target, "network/lan/s390.rb" @force_static_ip = ProductFeatures.GetBooleanFeature( diff --git a/src/include/network/lan/bridge.rb b/src/include/network/lan/bridge.rb deleted file mode 100644 index 9b075610b..000000000 --- a/src/include/network/lan/bridge.rb +++ /dev/null @@ -1,72 +0,0 @@ -# encoding: utf-8 - -# *************************************************************************** -# -# Copyright (c) 2012 Novell, Inc. -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -# -# ************************************************************************** -# File: include/network/lan/address.ycp -# Package: Network configuration -# Summary: Network card adresss configuration dialogs -# Authors: Michal Svec -# -module Yast - module NetworkLanBridgeInclude - include Logger - - def initialize_network_lan_bridge(_include_target) - textdomain "network" - end - - # Immediately updates device's ifcfg to be usable as bridge port. - # - # It mainly setups suitable BOOTPROTO an IP related values - def configure_as_bridge_port(device) - selected_interface = NetworkInterfaces.Current - log.info("Adapt device #{device} as bridge port") - - # when using wicked every device which can be bridged - # can be set to BOOTPROTO=none. No workaround with - # BOOTPROTO=static required anymore - if NetworkInterfaces.Edit(device) - NetworkInterfaces.Current["IPADDR"] = "" - NetworkInterfaces.Current["NETMASK"] = "" - NetworkInterfaces.Current["BOOTPROTO"] = "none" - # take out PREFIXLEN from old configuration (BNC#735109) - NetworkInterfaces.Current["PREFIXLEN"] = "" - - # remove all aliases (bnc#590167) - aliases = NetworkInterfaces.Current["_aliases"] || {} - aliases.each do |alias_name, alias_ip| - NetworkInterfaces.DeleteAlias(device, alias_name) if alias_ip - end - NetworkInterfaces.Current["_aliases"] = {} - - NetworkInterfaces.Commit - NetworkInterfaces.Add - - NetworkInterfaces.Current = selected_interface - end - - Lan.autoconf_slaves += [device] unless Lan.autoconf_slaves.include? device - - true - end - end -end diff --git a/src/lib/network/network_autoconfiguration.rb b/src/lib/network/network_autoconfiguration.rb index 7b8c026f7..570107bed 100644 --- a/src/lib/network/network_autoconfiguration.rb +++ b/src/lib/network/network_autoconfiguration.rb @@ -50,7 +50,7 @@ def any_iface_active? def configure_dhcp Yast::Lan.Read(:cache) - Yast.include self, "network/routines.rb" # TODO: needed only for phy_connected + Yast.include self, "network/routines.rb" # TODO: needed only for phy_connected # find out network devices suitable for dhcp autoconfiguration. # Such device has to: @@ -136,7 +136,7 @@ def configure_hosts # needn't to work when wickedd* services are already running # @param card [Y2Network::Interface] def setup_dhcp(card) - builder = Y2Network::InterfaceConfigBuilder.for(LanItems.GetCurrentType()) + builder = Y2Network::InterfaceConfigBuilder.for(card.type) builder.name = card.name builder.boot_protocol = Y2Network::BootProtocol::DHCP diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb index e46ff1fec..d5890cd95 100644 --- a/src/lib/y2network/autoinst/interfaces_reader.rb +++ b/src/lib/y2network/autoinst/interfaces_reader.rb @@ -86,8 +86,8 @@ def load_generic(config, interface_section) # Assign first netmask, as prefixlen has precedence so it will overwrite it ipaddr.netmask = interface_section.netmask if interface_section.netmask ipaddr.prefix = interface_section.prefixlen.to_i if interface_section.prefixlen - broadcast = interface_section.broadcast && IPAddress.new(interface_section.broadcast) - remote = interface_section.remote_ipaddr && IPAddress.new(interface_section.remote_ipaddr) + broadcast = IPAddress.new(interface_section.broadcast) unless interface_section.broadcast.empty? + remote = IPAddress.new(interface_section.remote_ipaddr) unless interface_section.remote_ipaddr.empty? config.ip = ConnectionConfig::IPConfig.new(ipaddr, broadcast: broadcast, remote_address: remote) end diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 75d6c6d9a..ef2f4fe35 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -17,6 +17,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. +require "y2storage" require "y2network/interface_type" require "y2network/boot_protocol" require "y2network/startmode" @@ -70,15 +71,25 @@ def initialize @firewall_zone = "" end + PROPOSED_PPPOE_MTU = 1492 # suggested value for PPPoE + # Propose reasonable defaults for given config. Useful for newly created devices. # @note difference between constructor and propose is that initialize should set simple defaults # and propose have more tricky config that depends on env, product, etc. def propose propose_startmode + self.mtu = PROPOSED_PPPOE_MTU if Yast::Arch.s390 && (type.lcs? || type.ethernet?) end def propose_startmode Yast.import "ProductFeatures" + # see bsc#176804 + devicegraph = Y2Storage::StorageManager.instance.staging + if devicegraph.filesystem_in_network?("/") + @startmode = Startmode.create("nfsroot") + log.info "startmode nfsroot" + return + end product_startmode = Yast::ProductFeatures.GetStringFeature( "network", diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index a39442fb7..995c0b36e 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -389,6 +389,11 @@ def mtu=(value) @connection_config.mtu = value.to_i end + def configure_as_slave + self.boot_protocol = "none" + self.aliases = [] + end + private def hwinfo diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index 4dbd20360..86ff1c017 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -48,7 +48,8 @@ def bridgeable_interfaces end def_delegators :@connection_config, - :ports, :ports= + :ports, :ports=, + :stp, :stp= private diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 961c51c92..39e223441 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -71,7 +71,6 @@ def main Yast.include self, "network/complex.rb" Yast.include self, "network/runtime.rb" - Yast.include self, "network/lan/bridge.rb" #------------- # GLOBAL DATA @@ -854,20 +853,24 @@ def IfcfgsToSkipVirtualizedProposal def ProposeVirtualized # then each configuration (except bridges) move to the bridge # and add old device name into bridge_ports - LanItems.Items.each do |current, config| - bridge_name = LanItems.new_type_device("br") + yast_config.interfaces.each do |interface| + bridge_builder = Y2Network::InterfaceConfigBuilder.for("br") + bridge_builder.name = yast_config.interfaces.free_name("br") - next unless connected_and_bridgeable?(bridge_name, current, config) + next unless connected_and_bridgeable?(bridge_builder, interface) - # first configure all connected unconfigured devices with dhcp (with default parameters) - # FIXME: ProposeItem is always true - next if !LanItems.IsItemConfigured(current) && !LanItems.ProposeItem(current) + next if yast_config.connections.by_name(interface.name) - ifcfg = LanItems.GetDeviceName(current) - next unless configure_as_bridge!(ifcfg, bridge_name) - # reconfigure existing device as newly created bridge's port - configure_as_bridge_port(ifcfg) - LanItems.move_routes(ifcfg, bridge_name) + bridge_builder.stp = false + bridge_builder.ports = interface.name + bridge_builder.startmode = "auto" + bridge_builder.save + + builder = Y2Network::InterfaceConfigBuilder.for(interface.type) + builder.name = interface.name + builder.configure_as_slave + builder.save + LanItems.move_routes(builder.name, bridge_builder.name) refresh_lan_items end @@ -1019,54 +1022,24 @@ def activate_network_service end end - def configure_as_bridge!(ifcfg, bridge_name) - return false if !NetworkInterfaces.Edit(ifcfg) - - log.info("device #{ifcfg} is gointg to be in bridge #{bridge_name}") - - NetworkInterfaces.Name = bridge_name - - # from bridge interface remove all bonding-related stuff - NetworkInterfaces.Current.each do |key, _value| - NetworkInterfaces.Current[key] = nil if key.include? "BONDING" - end - - NetworkInterfaces.Current["BRIDGE"] = "yes" - NetworkInterfaces.Current["BRIDGE_PORTS"] = ifcfg - NetworkInterfaces.Current["BRIDGE_STP"] = "off" - NetworkInterfaces.Current["BRIDGE_FORWARDDELAY"] = "0" - - # hardcode startmode (bnc#450670), it can't be ifplugd! - NetworkInterfaces.Current["STARTMODE"] = "auto" - # remove description - will be replaced by new (real) one - NetworkInterfaces.Current.delete("NAME") - # remove ETHTOOLS_OPTIONS as it is useful only for real hardware - NetworkInterfaces.Current.delete("ETHTOOLS_OPTIONS") - - NetworkInterfaces.Commit - end - # Convenience method that returns true if the current item has link and can # be enslaved in a bridge. # # @return [Boolean] true if it is bridgeable - def connected_and_bridgeable?(bridge_name, item, config) - # FIXME: a workaround until we fully use builders in proposals - bridge_builder = Y2Network::InterfaceConfigBuilder.for("br") - bridge_builder.name = bridge_name - - if !bridge_builder.bridgeable_interfaces.map(&:name).include?(LanItems.GetDeviceName(item)) - log.info "The interface #{config["ifcfg"]} cannot be proposed as bridge." + def connected_and_bridgeable?(bridge_builder, interface) + if !bridge_builder.bridgeable_interfaces.map(&:name).include?(interface.name) + log.info "The interface #{interface.name} cannot be proposed as bridge." return false end - hwinfo = config.fetch("hwinfo", {}) - unless hwinfo.fetch("link", false) - log.warn("Lan item #{item} has link:false detected") + hwinfo = interface.hardware + if !hwinfo.present? || !hwinfo.link + log.warn("Lan item #{interface.inspect} has link:false detected") return false end - if hwinfo.fetch("type", "") == "wlan" - log.warn("Not proposing WLAN interface for lan item: #{item}") + + if interface.type.wireless? + log.warn("Not proposing WLAN interface for lan item: #{interface.inspect}") return false end true @@ -1074,7 +1047,6 @@ def connected_and_bridgeable?(bridge_name, item, config) def refresh_lan_items LanItems.force_restart = true - log.info("List #{NetworkInterfaces.List("")}") # re-read configuration to see new items in UI LanItems.Read diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 8ecee334a..9191c421d 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -66,7 +66,6 @@ def main Yast.include self, "network/routines.rb" Yast.include self, "network/lan/s390.rb" Yast.include self, "network/lan/udev.rb" - Yast.include self, "network/lan/bridge.rb" reset_cache @@ -1499,46 +1498,6 @@ def SetItem(*) nil end - PROPOSED_PPPOE_MTU = "1492".freeze # suggested value for PPPoE - # A default configuration for device when installer needs to configure it - def ProposeItem(item_id) - Builtins.y2milestone("Propose configuration for %1", GetDeviceName(item_id)) - return false if Select("") != true - - type = Items().fetch(item_id, {}).fetch("hwinfo", {})[type] - builder = Y2Network::InterfaceConfigBuilder.for(type) - - builder.mtu = PROPOSED_PPPOE_MTU if Arch.s390 && Builtins.contains(["lcs", "eth"], type) - builder.ip_address = "" - builder.subnet_prefix = "" - builder.boot_protocol = Y2Network::BootProtocol::DHCP - - # see bsc#176804 - devicegraph = Y2Storage::StorageManager.instance.staging - if devicegraph.filesystem_in_network?("/") - builder.startmode = "nfsroot" - Builtins.y2milestone("startmode nfsroot") - end - - # FIXME: seems like a hack - NetworkInterfaces.Add - @operation = :edit - Ops.set( - @Items, - [item_id, "ifcfg"], - Ops.get_string(GetLanItem(item_id), ["hwinfo", "dev_name"], "") - ) - # FIXME: is it needed? - @description = HardwareName( - [Ops.get_map(GetLanItem(item_id), "hwinfo", {})], - Ops.get_string(GetLanItem(item_id), ["hwinfo", "dev_name"], "") - ) - - Commit(builder) - Builtins.y2milestone("After configuration propose %1", GetLanItem(item_id)) - true - end - def setDriver(driver) Builtins.y2milestone( "driver %1, %2", @@ -2182,7 +2141,6 @@ def yast_config publish function: :Commit, type: "boolean ()" publish function: :Rollback, type: "boolean ()" publish function: :DeleteItem, type: "void ()" - publish function: :ProposeItem, type: "boolean ()" publish function: :setDriver, type: "void (string)" publish function: :enableCurrentEditButton, type: "boolean ()" publish function: :createS390Device, type: "boolean ()" diff --git a/test/lan_test.rb b/test/lan_test.rb index 11d45b334..875b8cdeb 100755 --- a/test/lan_test.rb +++ b/test/lan_test.rb @@ -356,13 +356,10 @@ def expect_modification_succeedes(modname, method) end end - describe "#ProposeVirtualized" do + xdescribe "#ProposeVirtualized" do before do allow(Yast::LanItems).to receive(:IsCurrentConfigured).and_return(true) - allow(Yast::LanItems).to receive(:ProposeItem) - allow(Yast::Lan).to receive(:configure_as_bridge!) - allow(Yast::Lan).to receive(:configure_as_bridge_port) allow(Yast::Lan).to receive(:refresh_lan_items) allow(Yast::LanItems).to receive(:Items) @@ -376,7 +373,6 @@ def expect_modification_succeedes(modname, method) it "does not propose the interface" do allow(Yast::LanItems).to receive(:IsCurrentConfigured).and_return(false) - expect(Yast::LanItems).not_to receive(:ProposeItem) allow(Y2Network::Config) .to receive(:find) .and_return(instance_double(Y2Network::Config, interfaces: interfaces)) @@ -388,7 +384,7 @@ def expect_modification_succeedes(modname, method) context "when an interface is bridgeable" do before do allow(Yast::Lan).to receive(:connected_and_bridgeable?) - .with(anything, 0, anything).and_return(true) + .with(anything, 0).and_return(true) allow(Yast::Lan).to receive(:connected_and_bridgeable?) .with(anything, 1, anything).and_return(false) allow(Yast::Lan).to receive(:connected_and_bridgeable?) @@ -397,14 +393,12 @@ def expect_modification_succeedes(modname, method) it "does not configure the interface if it is not connected" do allow(Yast::Lan).to receive(:connected_and_bridgeable?).and_return(false) - expect(Yast::LanItems).not_to receive(:ProposeItem) - Yast::Lan.ProposeVirtualized + expect { Yast::Lan.ProposeVirtualized }.to_not change { yast_config.connections.size } end it "configures the interface with defaults before anything if not configured" do allow(Yast::LanItems).to receive(:IsItemConfigured).and_return(false) - expect(Yast::LanItems).to receive(:ProposeItem) Yast::Lan.ProposeVirtualized end diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 2330f77d2..60f9722a8 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -72,6 +72,8 @@ def probe_netcard_factory(num) before do Y2Network::Config.add(:yast, yast_config) Y2Network::Config.add(:system, system_config) + allow(yast_config).to receive(:write) + allow(Yast::Lan).to receive(:Read) end describe "it sets DHCLIENT_SET_DEFAULT_ROUTE properly" do @@ -79,40 +81,6 @@ def probe_netcard_factory(num) let(:network_interfaces) { double("NetworkInterfaces") } before(:each) do - ifcfg_files = SectionKeyValue.new - - # network configs - allow(Yast::SCR).to receive(:Dir) do |path| - case path.to_s - when ".network.section" - ifcfg_files.sections - when /^\.network\.value\."(eth\d+)"$/ - ifcfg_files.keys(Regexp.last_match(1)) - when ".modules.options", ".etc.install_inf" - [] - else - raise "Unexpected Dir #{path}" - end - end - - allow(Yast::SCR).to receive(:Read) do |path| - if path.to_s =~ /^\.network\.value\."(eth\d+)".(.*)/ - next ifcfg_files.get(Regexp.last_match(1), Regexp.last_match(2)) - end - - raise "Unexpected Read #{path}" - end - - allow(Yast::SCR).to receive(:Write) do |path, value| - if path.to_s =~ /^\.network\.value\."(eth\d+)".(.*)/ - ifcfg_files.set(Regexp.last_match(1), Regexp.last_match(2), value) - elsif path.to_s == ".network" && value.nil? - true - else - raise "Unexpected Write #{path}, #{value}" - end - end - # stub NetworkInterfaces, apart from the ifcfgs allow(Yast::NetworkInterfaces) .to receive(:CleanHotplugSymlink) @@ -147,13 +115,13 @@ def probe_netcard_factory(num) # because SCR multiplexes too much and the matchers get confused. # Hardware detection - expect(Yast::SCR) + allow(Yast::SCR) .to receive(:Read) .with(path(".probe.netcard")) .and_return([probe_netcard_factory(0), probe_netcard_factory(1)]) # link status - expect(Yast::SCR) + allow(Yast::SCR) .to receive(:Read) .with(path(".target.string"), %r{/sys/class/net/.*/carrier}) .twice @@ -163,29 +131,12 @@ def probe_netcard_factory(num) allow(Yast::Arch).to receive(:architecture).and_return "x86_64" allow(Yast::Confirm).to receive(:Detection).and_return true - expect(Yast::SCR) - .to receive(:Read) - .with(path(".etc.install_inf.BrokenModules")) - .and_return "" - expect(Yast::SCR) - .to receive(:Read) - .with(path(".udev_persistent.net")) - .and_return({}) - expect(Yast::SCR) - .to receive(:Read) - .with(path(".udev_persistent.drivers")) - .and_return({}) allow(Yast::NetworkInterfaces).to receive(:Write).and_call_original - # reinit network interfaces to avoid trash from other tests - Yast::NetworkInterfaces.main end it "configures just one NIC to have a default route" do - pending "adapt to new API" 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 eq nil + # TODO: write it when we can set up dhcp default route end end @@ -197,9 +148,9 @@ def probe_netcard_factory(num) it "returns true if any of available interfaces has configuration and is up" do allow(Yast::Lan).to receive(:yast_config) .and_return(Y2Network::Config.new( - interfaces: Y2Network::InterfacesCollection.new([double(name: IFACE)]), - connections: Y2Network::ConnectionConfigsCollection.new([double(name: IFACE)]), - source: :testing + interfaces: Y2Network::InterfacesCollection.new([double(name: IFACE)]), + connections: Y2Network::ConnectionConfigsCollection.new([double(name: IFACE)]), + source: :testing )) allow(Yast::SCR) .to receive(:Execute) @@ -228,10 +179,11 @@ def probe_netcard_factory(num) let(:proposal) { false } let(:eth0_profile) do { - "BOOTPROTO" => "static", - "IPADDR" => "192.168.122.213", - "NETMASK" => "255.255.255.0", - "STARTMODE" => "auto" + "bootproto" => "static", + "ipaddr" => "192.168.122.213", + "netmask" => "255.255.255.0", + "startmode" => "auto", + "device" => "eth0" } end let(:routes_profile) do @@ -253,13 +205,8 @@ def probe_netcard_factory(num) allow(Yast::LanItems).to receive(:Read) allow(yast_config).to receive(:write) allow(Yast::Lan).to receive(:connected_and_bridgeable?).and_return(true) - # FIXME: seems that autoinst config reader is ... not ready yet - allow(Y2Network::Sysconfig::TypeDetector) - .to receive(:type_of) - .with(/eth[0-9]/) - .and_return(Y2Network::InterfaceType::ETHERNET) + allow(Yast::PackageSystem).to receive(:Installed).and_return(true) Yast::Lan.Import( - "devices" => { "eth" => { "eth0" => eth0_profile } }, "routing" => { "routes" => routes_profile } ) end @@ -271,14 +218,13 @@ def probe_netcard_factory(num) end end - # TODO: write it using new backend as now changes is not longer done in NetworkInterfaces - xcontext "when the proposal is required" do + context "when the proposal is required" do + let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } let(:proposal) { true } it "creates the virtulization proposal config" do expect(Yast::Lan).to receive(:ProposeVirtualized).and_call_original - expect { instance.configure_virtuals }.to change { Yast::NetworkInterfaces.Devices.keys.size }.from(1).to(2) - expect(Yast::NetworkInterfaces.Devices["br"]["br0"]).to include(eth0_profile.merge("BRIDGE_PORTS" => "eth0")) + expect { instance.configure_virtuals }.to change { yast_config.connections.size }.from(0).to(2) end it "writes the configuration of the interfaces" do diff --git a/test/test_helper.rb b/test/test_helper.rb index 482d2a893..3bf788329 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -50,6 +50,8 @@ Yast.import "NetworkInterfaces" Yast.import "Lan" +require "y2storage" + require_relative "SCRStub" RSpec.configure do |c| @@ -65,6 +67,7 @@ allow(Yast::NetworkInterfaces).to receive(:Write) allow(Y2Network::Hwinfo).to receive(:hwinfo_from_hardware) allow(Yast::Lan).to receive(:system_config).and_return(Y2Network::Config.new(source: :testing)) + Y2Storage::StorageManager.create_test_instance end end From 2b546203f496d8cdc02174c7e0cc879d1912d9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 13:01:00 +0100 Subject: [PATCH 388/471] Add a Config#configured_interface? method --- src/lib/y2network/config.rb | 11 +++++++++++ test/y2network/config_test.rb | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 1996e1581..8ccc0388c 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -192,6 +192,17 @@ def add_or_update_driver(new_driver) end end + # Determines whether a given interface is configured or not + # + # An interface is considered as configured when it has an associated collection. + # + # @param iface_name [String] Interface's name + # @return [Boolean] + def configured_interface?(iface_name) + return false if iface_name.nil? || iface_name.empty? + !connections.by_interface(iface_name).empty? + end + alias_method :eql?, :== end end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 4f461e129..92687b3cb 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -372,4 +372,30 @@ end end end + + describe "#configured_interface?" do + context "when a connection for the given interface exists" do + it "reeturns true" do + expect(config.configured_interface?("eth0")).to eq(true) + end + end + + context "when no connection for the given interface exists" do + it "reeturns false" do + expect(config.configured_interface?("eth9")).to eq(false) + end + end + + context "when interface name is nil" do + it "returns false" do + expect(config.configured_interface?(nil)).to eq(false) + end + end + + context "when interface name is empty" do + it "returns false" do + expect(config.configured_interface?("")).to eq(false) + end + end + end end From f7ec02bf6a9d70d104258fc368959b3139e11227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 13:20:05 +0100 Subject: [PATCH 389/471] Drop Interface#configured * Y2Network::Config is responsible for finding out whether an interface is configured or not. --- src/lib/y2network/interface.rb | 15 --------------- .../interface_config_builders/bonding.rb | 2 +- .../y2network/interface_config_builders/bridge.rb | 2 +- src/lib/y2network/sysconfig/config_writer.rb | 2 +- test/y2network/sysconfig/config_writer_test.rb | 5 ++--- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/lib/y2network/interface.rb b/src/lib/y2network/interface.rb index 513816bd1..90d59c9ac 100644 --- a/src/lib/y2network/interface.rb +++ b/src/lib/y2network/interface.rb @@ -43,8 +43,6 @@ class Interface attr_accessor :description # @return [InterfaceType] Interface type attr_accessor :type - # @return [Boolean] - attr_reader :configured # @return [HwInfo] attr_reader :hardware # @return [Symbol] Mechanism to rename the interface (:none -no rename-, :bus_id or :mac) @@ -76,8 +74,6 @@ def initialize(name, type: InterfaceType::ETHERNET) @type = type # TODO: move renaming logic to physical interfaces only @renaming_mechanism = :none - - init(name) end # Determines whether two interfaces are equal @@ -118,16 +114,5 @@ def rename(new_name, mechanism) @name = new_name @renaming_mechanism = mechanism end - - private - - def system_config(name) - Yast::Lan.system_config.connections.by_name(name) - end - - def init(name) - @configured = false - @configured = !system_config(name).nil? if !(name.nil? || name.empty?) - end end end diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 3271ebac5..1f9475835 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -84,7 +84,7 @@ def bondable?(iface) # already contains partially configured bond when adding return false if iface.name == @name - return true if !iface.configured + return true unless yast_config.configured_interface?(iface.name) iface.bootproto == "none" end diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index 86ff1c017..74ebfbd36 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -73,7 +73,7 @@ def bridgeable?(iface) # FIXME: this can happen only bcs we silently use LanItems::Items which # already contains partially configured bridge when adding return false if iface.name == @name - return true if !iface.configured + return true unless yast_config.configured_interface?(iface.name) if interfaces.bond_index[iface.name] log.debug("Excluding (#{iface.name}) - is bonded") diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 66c56bd99..6a320336c 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -69,7 +69,7 @@ def write_interface_changes(config, old_config) file = routes_file_for(dev) # Remove ifroutes-* if empty or interface is not configured - file.remove if routes.empty? || !dev.configured + file.remove if routes.empty? || !config.configured_interface?(dev.name) file.routes = routes file.save diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index c677a794a..8fa9bee8a 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -19,6 +19,7 @@ require_relative "../../test_helper" require "y2network/sysconfig/config_writer" require "y2network/config" +require "y2network/connection_configs_collection" require "y2network/interface" require "y2network/interfaces_collection" require "y2network/routing" @@ -35,7 +36,7 @@ let(:config) do Y2Network::Config.new( interfaces: Y2Network::InterfacesCollection.new([eth0]), - connections: [eth0_conn], + connections: Y2Network::ConnectionConfigsCollection.new([eth0_conn]), routing: routing, source: :sysconfig ) @@ -99,7 +100,6 @@ .and_return(conn_writer) allow(Y2Network::Sysconfig::InterfacesWriter).to receive(:new) .and_return(interfaces_writer) - allow(eth0).to receive(:configured).and_return(true) end it "saves general routes to main routes file" do @@ -150,7 +150,6 @@ allow(Y2Network::Sysconfig::RoutesFile).to receive(:new) .with("/etc/sysconfig/network/ifroute-eth1") .and_return(ifroute_eth1) - allow(eth1).to receive(:configured).and_return(true) end it "removes the ifroute file" do From 524af10a6aa94715a7f184a1f6cff3b84f2fd3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 14:16:00 +0100 Subject: [PATCH 390/471] Fix existing udev rules mocking --- test/y2network/sysconfig/interfaces_writer_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index b6d49b292..531d522af 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -51,7 +51,8 @@ allow(writer).to receive(:sleep) # prevent collision with real hardware - allow(Y2Network::UdevRule).to receive(:all).and_return([]) + allow(Y2Network::UdevRule).to receive(:naming_rules).and_return([]) + allow(Y2Network::UdevRule).to receive(:drivers_rules).and_return([]) end around do |example| From ec58c8afbae46f63e4a09474565892ab56661ef0 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 16 Sep 2019 15:26:49 +0200 Subject: [PATCH 391/471] fix bridgeable and bondable --- .../interface_config_builders/bonding.rb | 10 +++++----- .../interface_config_builders/bridge.rb | 18 +++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 1f9475835..d3f0d89b8 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -74,19 +74,19 @@ def bondable?(iface) return false unless s390_config["QETH_LAYER2"] == "yes" end - if interfaces.bond_index[iface.name] && interfaces.bond_index[iface.name] != @name - log.debug("Excluding (#{iface.name}) - is already bonded") + config = yast_config.connections.by_name(iface.name) + master = config.find_master(yast_config.connections) + if master + log.debug("Excluding (#{iface.name}) - already has master #{master.inspect}") return false end # cannot enslave itself - # FIXME: this can happen only bcs we silently use LanItems::Items which - # already contains partially configured bond when adding return false if iface.name == @name return true unless yast_config.configured_interface?(iface.name) - iface.bootproto == "none" + config.bootproto.to_s == "none" end end end diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index 74ebfbd36..b49e44e4f 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -54,7 +54,7 @@ def bridgeable_interfaces private def interfaces - Config.find(:yast).interfaces + yast_config.interfaces end NONBRIDGEABLE_TYPES = [ @@ -75,14 +75,10 @@ def bridgeable?(iface) return false if iface.name == @name return true unless yast_config.configured_interface?(iface.name) - if interfaces.bond_index[iface.name] - log.debug("Excluding (#{iface.name}) - is bonded") - return false - end - - # the iface is already in another bridge - if interfaces.bridge_index[iface.name] && interfaces.bridge_index[iface.name] != @name - log.debug("Excluding (#{iface.name}) - already bridged") + config = yast_config.connections.by_name(iface.name) + master = config.find_master(yast_config.connections) + if master + log.debug("Excluding (#{iface.name}) - already has master #{master.inspect}") return false end @@ -92,8 +88,8 @@ def bridgeable?(iface) return false end - if NONBRIDGEABLE_STARTMODE.include?(iface.startmode) - log.debug("Excluding (#{iface.name}) - is #{iface.startmode}") + if NONBRIDGEABLE_STARTMODE.include?(config.startmode.to_s) + log.debug("Excluding (#{iface.name}) - is #{config.startmode}") return false end From 92ff6e08d5f52aeab7681a2616b39f7c9298ccf3 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 12:52:54 +0200 Subject: [PATCH 392/471] fixes for bond and bridge. Also unify bridge and bond ability to auto configure --- src/include/network/lan/address.rb | 1 - src/lib/y2network/interface_config_builder.rb | 5 +- .../interface_config_builders/bonding.rb | 31 ++++++++++-- .../interface_config_builders/bridge.rb | 23 +++++++-- src/lib/y2network/sysconfig/config_reader.rb | 5 +- src/lib/y2network/widgets/bond_slave.rb | 18 ++++++- src/lib/y2network/widgets/bridge_ports.rb | 4 +- src/lib/y2network/widgets/slave_items.rb | 50 ++++++------------- src/modules/Lan.rb | 2 +- test/y2network/widgets/bond_slave_test.rb | 12 +++-- 10 files changed, 96 insertions(+), 55 deletions(-) diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb index b994a692a..7bbb96646 100644 --- a/src/include/network/lan/address.rb +++ b/src/include/network/lan/address.rb @@ -60,7 +60,6 @@ def AddressDialog(builder:) @builder = builder ret = Y2Network::Dialogs::EditInterface.run(builder) - log.info "ShowAndRun: #{ret}" if ret != :back && ret != :abort if LanItems.isCurrentDHCP && !LanItems.isCurrentHotplug diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index b62451cd0..a6a128921 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -81,7 +81,9 @@ def initialize(type:, config: nil) # TODO: also config need to store it, as newly added can be later # edited with option for not yet created interface @newly_added = config.nil? - if !config + if config + self.name = config.name + else config = connection_config_klass(type).new config.propose end @@ -230,6 +232,7 @@ def startmode=(name) # @param [Integer] value priority value def ifplugd_priority=(value) if !@connection_config.startmode || @connection_config.startmode.name != "ifplugd" + log.info "priority set and startmode is not ifplugd. Adapting..." @connection_config.startmode = Startmode.create("ifplugd") end @connection_config.startmode.priority = value.to_i diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index d3f0d89b8..025784912 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -50,10 +50,33 @@ def bond_options connection_config.options end + # Checks if any of given device is already configured and need adaptation for bridge + def already_configured?(devices) + devices.any? do |device| + next false unless yast_config.configured_interface?(device) + yast_config.connections.by_name(device).startmode.name != "none" + end + end + + # additionally it adapt slaves if needed + def save + slaves.each do |slave| + interface = yast_config.interfaces.by_name(slave) + connection = yast_config.connections.by_name(slave) + next unless connection + next if connection.startmode.name == "none" + builder = InterfaceConfigBuilder.for(interface.type, config: connection) + builder.configure_as_slave + builder.save + end + + super + end + private def interfaces - Config.find(:yast).interfaces + yast_config.interfaces end # Checks whether an interface can be enslaved in particular bond interface @@ -76,7 +99,7 @@ def bondable?(iface) config = yast_config.connections.by_name(iface.name) master = config.find_master(yast_config.connections) - if master + if master && master.name != name log.debug("Excluding (#{iface.name}) - already has master #{master.inspect}") return false end @@ -84,9 +107,7 @@ def bondable?(iface) # cannot enslave itself return false if iface.name == @name - return true unless yast_config.configured_interface?(iface.name) - - config.bootproto.to_s == "none" + true end end end diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index b49e44e4f..aef65a1e7 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -37,8 +37,8 @@ def initialize(config: nil) # Checks if any of given device is already configured and need adaptation for bridge def already_configured?(devices) devices.any? do |device| - next false if Yast::NetworkInterfaces.devmap(device).nil? - ![nil, "none"].include?(Yast::NetworkInterfaces.devmap(device)["BOOTPROTO"]) + next false unless yast_config.configured_interface?(device) + yast_config.connections.by_name(device).bootproto.name != "none" end end @@ -47,6 +47,21 @@ def bridgeable_interfaces interfaces.select { |i| bridgeable?(i) } end + # additionally it adapt slaves if needed + def save + ports.each do |port| + interface = yast_config.interfaces.by_name(port) + connection = yast_config.connections.by_name(port) + next unless connection + next if connection.startmode.name == "none" + builder = InterfaceConfigBuilder.for(interface.type, config: connection) + builder.configure_as_slave + builder.save + end + + super + end + def_delegators :@connection_config, :ports, :ports=, :stp, :stp= @@ -70,14 +85,12 @@ def interfaces # @param iface [Interface] an interface to be validated as the bridge slave def bridgeable?(iface) # cannot enslave itself - # FIXME: this can happen only bcs we silently use LanItems::Items which - # already contains partially configured bridge when adding return false if iface.name == @name return true unless yast_config.configured_interface?(iface.name) config = yast_config.connections.by_name(iface.name) master = config.find_master(yast_config.connections) - if master + if master && master.name != name log.debug("Excluding (#{iface.name}) - already has master #{master.inspect}") return false end diff --git a/src/lib/y2network/sysconfig/config_reader.rb b/src/lib/y2network/sysconfig/config_reader.rb index 84342aa12..c7a7db144 100644 --- a/src/lib/y2network/sysconfig/config_reader.rb +++ b/src/lib/y2network/sysconfig/config_reader.rb @@ -45,7 +45,7 @@ def config tables: routing_tables, forward_ipv4: forward_ipv4?, forward_ipv6: forward_ipv6? ) - Config.new( + result = Config.new( interfaces: interfaces_reader.interfaces, connections: interfaces_reader.connections, drivers: interfaces_reader.drivers, @@ -53,6 +53,9 @@ def config dns: dns, source: :sysconfig ) + + log.info "Sysconfig reader result: #{result.inspect}" + result end private diff --git a/src/lib/y2network/widgets/bond_slave.rb b/src/lib/y2network/widgets/bond_slave.rb index 9250257b7..4a4691ea0 100644 --- a/src/lib/y2network/widgets/bond_slave.rb +++ b/src/lib/y2network/widgets/bond_slave.rb @@ -23,6 +23,7 @@ require "y2network/widgets/slave_items" Yast.import "Label" +Yast.import "Lan" Yast.import "Popup" Yast.import "UI" @@ -91,7 +92,8 @@ def init # TODO: use def items, but problem now is that slave_items returns term and not array items = slave_items_from( @settings.bondable_interfaces.map(&:name), - slaves + slaves, + Yast::Lan.yast_config # ideally get it from builder? ) # reorder the items @@ -124,7 +126,19 @@ def store def validate physical_ports = repeated_physical_port_ids(selected_items) - physical_ports.empty? ? true : continue_with_duplicates?(physical_ports) + if !physical_ports.empty? + return false unless continue_with_duplicates?(physical_ports) + end + + if @settings.already_configured?(selected_items || []) + return Yast::Popup.ContinueCancel( + _( + "At least one selected device is already configured.\nAdapt the configuration for bonding?\n" + ) + ) + else + true + end end def value diff --git a/src/lib/y2network/widgets/bridge_ports.rb b/src/lib/y2network/widgets/bridge_ports.rb index 3470f46d6..752f041aa 100644 --- a/src/lib/y2network/widgets/bridge_ports.rb +++ b/src/lib/y2network/widgets/bridge_ports.rb @@ -22,6 +22,7 @@ require "y2network/widgets/slave_items" Yast.import "Label" +Yast.import "Lan" Yast.import "Popup" Yast.import "UI" @@ -50,7 +51,8 @@ def init br_ports = @settings.ports items = slave_items_from( @settings.bridgeable_interfaces.map(&:name), - br_ports + br_ports, + Yast::Lan.yast_config # ideally get it from builder? ) # it is list of Items, so cannot use `change_items` helper diff --git a/src/lib/y2network/widgets/slave_items.rb b/src/lib/y2network/widgets/slave_items.rb index 87e7567cd..c5101d011 100644 --- a/src/lib/y2network/widgets/slave_items.rb +++ b/src/lib/y2network/widgets/slave_items.rb @@ -34,51 +34,41 @@ module SlaveItems # # @param [Array] slaves list of device names # @param [Array] enslaved_ifaces list of device names of already enslaved devices - def slave_items_from(slaves, enslaved_ifaces) + # @param [ConnectionConfig] config where slaves lives + def slave_items_from(slaves, enslaved_ifaces, config) raise ArgumentError, "slaves cannot be nil" if slaves.nil? raise ArgumentError, "enslaved interfaces cannot be nil" if enslaved_ifaces.nil? raise ArgumentError, "slaves cannot be empty" if slaves.empty? && !enslaved_ifaces.empty? textdomain "network" - item_ids = slaves.map { |s| Yast::LanItems.find_configured(s) || Yast::LanItems.FindDeviceIndex(s) } + log.debug "creating list of slaves from #{slaves.inspect}" - item_ids.each_with_object([]) do |item_id, items| - # TODO: do not touch directly LanItems here, but current it is quite hard to list all items without it - dev_name = Yast::LanItems.GetDeviceName(item_id) + slaves.each_with_object([]) do |slave, result| + interface = config.interfaces.by_name(slave) - next if dev_name.nil? || dev_name.empty? + next unless interface - dev_type = Yast::LanItems.GetDeviceType(item_id) - - if ["tun", "tap"].include?(dev_type) - description = Yast::NetworkInterfaces.GetDevTypeDescription(dev_type, true) + if interface.type.tun? || interface.type.tap? + description = Yast::NetworkInterfaces.GetDevTypeDescription(interface.type.short_name, true) else - ifcfg = Yast::LanItems.GetDeviceMap(item_id) || {} - - description = TmpInclude.new.BuildDescription( - dev_type, - dev_name, - ifcfg, - [Yast::LanItems.GetLanItem(item_id)["hwinfo"] || {}] - ) + description = interface.name # this conditions origin from bridge configuration # if enslaving a configured device then its configuration is rewritten # to "0.0.0.0/32" # # translators: a note that listed device is already configured - description += " " + _("configured") if ifcfg["IPADDR"] != "0.0.0.0" + description += " " + _("configured") if config.connections.by_name(interface.name) end - selected = false - selected = enslaved_ifaces.include?(dev_name) if enslaved_ifaces + selected = enslaved_ifaces.include?(interface.name) - description << " (Port ID: #{physical_port_id(dev_name)})" if physical_port_id?(dev_name) + description << " (Port ID: #{physical_port_id(interface.name)})" if physical_port_id?(interface.name) - items << Yast::Term.new(:item, - Yast::Term.new(:id, dev_name), - "#{dev_name} - #{description}", + result << Yast::Term.new(:item, + Yast::Term.new(:id, interface.name), + "#{interface.name} - #{description}", selected) end end @@ -103,16 +93,6 @@ def physical_port_id(dev_name) def physical_port_id?(dev_name) !physical_port_id(dev_name).empty? end - - # TODO: just cleaner way to get a bit more complex method from include for now - class TmpInclude - include Yast - include Yast::I18n - - def initialize - Yast.include self, "network/complex.rb" - end - end end end end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 39e223441..17a60aba5 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -862,7 +862,7 @@ def ProposeVirtualized next if yast_config.connections.by_name(interface.name) bridge_builder.stp = false - bridge_builder.ports = interface.name + bridge_builder.ports = [interface.name] bridge_builder.startmode = "auto" bridge_builder.save diff --git a/test/y2network/widgets/bond_slave_test.rb b/test/y2network/widgets/bond_slave_test.rb index 74853da10..9392522cc 100644 --- a/test/y2network/widgets/bond_slave_test.rb +++ b/test/y2network/widgets/bond_slave_test.rb @@ -21,9 +21,15 @@ require "cwm/rspec" require "y2network/widgets/bond_slave" +require "y2network/interface_config_builders/bonding" describe Y2Network::Widgets::BondSlave do - subject { described_class.new({}) } + let(:builder) { Y2Network::InterfaceConfigBuilders::Bonding.new } + subject { described_class.new(builder) } + + before do + allow(builder).to receive(:yast_config).and_return(Y2Network::Config.new(source: :testing)) + end include_examples "CWM::CustomWidget" @@ -60,9 +66,9 @@ allow(subject).to receive(:physical_port_id).with(i).and_return("00010486fd348") end - expect(Yast::Popup).to receive(:YesNoHeadline).and_return(:request_answer) + expect(Yast::Popup).to receive(:YesNoHeadline).and_return(false) - expect(subject.validate).to eql(:request_answer) + expect(subject.validate).to eql(false) end end end From 86fd804a78201ae9489a0ba06e4df8584b6031ec Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 13:20:02 +0200 Subject: [PATCH 393/471] improve doc --- src/lib/y2network/interface_config_builders/bonding.rb | 2 ++ src/lib/y2network/interface_config_builders/bridge.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 025784912..4b769df5f 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -51,6 +51,8 @@ def bond_options end # Checks if any of given device is already configured and need adaptation for bridge + # @param devices [Array] devices to check + # @return [Boolean] true if there is device that needs adaptation def already_configured?(devices) devices.any? do |device| next false unless yast_config.configured_interface?(device) diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index aef65a1e7..e3c43846d 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -35,6 +35,8 @@ def initialize(config: nil) end # Checks if any of given device is already configured and need adaptation for bridge + # @param devices [Array] devices to check + # @return [Boolean] true if there is device that needs adaptation def already_configured?(devices) devices.any? do |device| next false unless yast_config.configured_interface?(device) From 987c73c5bb9a5cf4e04dd7f62b5a2cf2f5dc2618 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 13:56:42 +0200 Subject: [PATCH 394/471] do not show hardware for virtual devices --- src/lib/y2network/dialogs/edit_interface.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/dialogs/edit_interface.rb b/src/lib/y2network/dialogs/edit_interface.rb index d3944cfe4..ed208ac0f 100644 --- a/src/lib/y2network/dialogs/edit_interface.rb +++ b/src/lib/y2network/dialogs/edit_interface.rb @@ -53,15 +53,14 @@ def contents addr_tab.initial = true unless @settings.type.wireless? tabs = case @settings.type.short_name - when "vlan" + when "vlan", "dummy" [Widgets::GeneralTab.new(@settings), addr_tab] when "tun", "tap" [addr_tab] when "br" [Widgets::GeneralTab.new(@settings), addr_tab, Widgets::BridgePorts.new(@settings)] when "bond" - [Widgets::GeneralTab.new(@settings), addr_tab, Widgets::HardwareTab.new(@settings), - Widgets::BondSlavesTab.new(@settings)] + [Widgets::GeneralTab.new(@settings), addr_tab, Widgets::BondSlavesTab.new(@settings)] when "wlan" wireless = Widgets::WirelessTab.new(@settings) wireless.initial = true From 6f33af6c69330485ba4274a63b38b66ea4ddbd30 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 14:39:10 +0200 Subject: [PATCH 395/471] fix devices for vlan --- .../interface_config_builders/vlan.rb | 23 +++++-------------- .../interface_config_builders/vlan_test.rb | 4 ++++ test/y2network/widgets/vlan_interface_test.rb | 4 ++++ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/lib/y2network/interface_config_builders/vlan.rb b/src/lib/y2network/interface_config_builders/vlan.rb index 590ad4d8d..83c4cd198 100644 --- a/src/lib/y2network/interface_config_builders/vlan.rb +++ b/src/lib/y2network/interface_config_builders/vlan.rb @@ -53,26 +53,15 @@ def etherdevice=(value) # @return [Hash] returns ordered list of devices that can be used for vlan # Keys are ids for #etherdevice and value are label def possible_vlans - res = {} - # unconfigured devices - # TODO: new backend - Yast::LanItems.Items.each_value do |lan_item| - next unless (lan_item["ifcfg"] || "").empty? - dev_name = lan_item.fetch("hwinfo", {}).fetch("dev_name", "") - res[dev_name] = dev_name - end - # configured devices - configurations = Yast::NetworkInterfaces.FilterDevices("netcard") - # TODO: API looks horrible - Yast::NetworkInterfaces.CardRegex["netcard"].split("|").each do |devtype| - (configurations[devtype] || {}).each_key do |devname| - next if Yast::NetworkInterfaces.GetType(devname) == type + yast_config.interfaces.to_a.each_with_object({}) do |interface, result| + next if interface.type.vlan? # does not make sense to have vlan of vlan - res[devname] = "#{devname} - #{Yast::Ops.get_string(configurations, [devtype, devname, "NAME"], "")}" + result[interface.name] = if interface.hardware.present? + "#{interface.name} - #{interface.hardware.description}" + else + interface.name end end - - res end end end diff --git a/test/y2network/interface_config_builders/vlan_test.rb b/test/y2network/interface_config_builders/vlan_test.rb index 3ea2ec02f..bcb8631ff 100644 --- a/test/y2network/interface_config_builders/vlan_test.rb +++ b/test/y2network/interface_config_builders/vlan_test.rb @@ -32,6 +32,10 @@ res end + before do + allow(config_builder).to receive(:yast_config).and_return(Y2Network::Config.new(source: :testing)) + end + describe "#type" do it "returns vlan type" do expect(subject.type).to eq Y2Network::InterfaceType::VLAN diff --git a/test/y2network/widgets/vlan_interface_test.rb b/test/y2network/widgets/vlan_interface_test.rb index ed95f2add..921dda5b5 100644 --- a/test/y2network/widgets/vlan_interface_test.rb +++ b/test/y2network/widgets/vlan_interface_test.rb @@ -27,5 +27,9 @@ let(:builder) { Y2Network::InterfaceConfigBuilder.for("vlan") } subject { described_class.new(builder) } + before do + allow(builder).to receive(:yast_config).and_return(Y2Network::Config.new(source: :testing)) + end + include_examples "CWM::ComboBox" end From 3badeae2c6609be5f08533fca96a264792c08c40 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 14:52:34 +0200 Subject: [PATCH 396/471] add note to vlans --- src/lib/y2network/widgets/interfaces_table.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 150bd59b6..b9322889b 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -79,6 +79,12 @@ def note(interface, conn, config) master = conn.find_master(config.connections) return format(_("enslaved in %s"), master.name) if master + # TODO: maybe add to find master, but then it cannot be used in bond or bridge. Does it reflect reality? + if conn.type.vlan? + return format(_("enslaved in %s"), conn.parent_device) + end + + "" end From 73464a8006121a41e470e8ec4d1a65a33d4bc53f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 15:00:49 +0200 Subject: [PATCH 397/471] make rubocop happy --- src/lib/y2network/widgets/interfaces_table.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index b9322889b..d3e7d94d7 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -84,7 +84,6 @@ def note(interface, conn, config) return format(_("enslaved in %s"), conn.parent_device) end - "" end From 9c6543956466f6dfc0f249e8abe09ee2be23710b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 15:17:15 +0200 Subject: [PATCH 398/471] avoid crash for unconfigured items --- src/lib/y2network/widgets/interfaces_table.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index d3e7d94d7..f59309d86 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -76,6 +76,8 @@ def note(interface, conn, config) return format("%s -> %s", interface.old_name, interface.name) end + return "" unless conn + master = conn.find_master(config.connections) return format(_("enslaved in %s"), master.name) if master From 259b9ee3f09a3ba4d0202903e7fa382d70440140 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 15:35:07 +0200 Subject: [PATCH 399/471] fix missing domain --- src/lib/y2network/widgets/boot_protocol.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/boot_protocol.rb b/src/lib/y2network/widgets/boot_protocol.rb index 5c143751c..83060689a 100644 --- a/src/lib/y2network/widgets/boot_protocol.rb +++ b/src/lib/y2network/widgets/boot_protocol.rb @@ -256,7 +256,7 @@ def validate hname = Yast::UI.QueryWidget(:bootproto_hostname, :Value) if !hname.empty? if !Yast::Hostname.CheckFQ(hname) - Popup.Error(_("Invalid hostname.")) + Yast::Popup.Error(_("Invalid hostname.")) Yast::UI.SetFocus(:bootproto_hostname) return false end From 825f3307bcc2736be49e8ac7ddceff4a93b43789 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 17 Sep 2019 15:49:41 +0200 Subject: [PATCH 400/471] improve visual for change button --- src/lib/y2network/widgets/udev_rules.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/udev_rules.rb b/src/lib/y2network/widgets/udev_rules.rb index ed089fcc1..766cdf906 100644 --- a/src/lib/y2network/widgets/udev_rules.rb +++ b/src/lib/y2network/widgets/udev_rules.rb @@ -36,7 +36,10 @@ def contents _("Udev Rules"), HBox( InputField(Id(:udev_rules_name), Opt(:hstretch, :disabled), _("Device Name"), ""), - PushButton(Id(:udev_rules_change), _("Change")) + VBox( + VSpacing(), + PushButton(Id(:udev_rules_change), _("Change")) + ) ) ) end From 5e09dc6344f3308344f03e31f5852e2e511ab5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 13 Sep 2019 11:44:35 +0100 Subject: [PATCH 401/471] Drop udev writing/export capabilities from LanItems --- src/include/network/lan/udev.rb | 121 ----------------- src/modules/Lan.rb | 7 - src/modules/LanItems.rb | 227 -------------------------------- test/lan_items_export_test.rb | 121 ----------------- test/udev_test.rb | 173 ------------------------ 5 files changed, 649 deletions(-) delete mode 100644 src/include/network/lan/udev.rb delete mode 100755 test/lan_items_export_test.rb delete mode 100755 test/udev_test.rb diff --git a/src/include/network/lan/udev.rb b/src/include/network/lan/udev.rb deleted file mode 100644 index fb6015db3..000000000 --- a/src/include/network/lan/udev.rb +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -module Yast - # Functions for handling udev rules - module NetworkLanUdevInclude - # Creates default udev rule for given NIC. - # - # Udev rule is based on device's MAC. - # - # @return [Array] an udev rule - def GetDefaultUdevRule(dev_name, dev_mac) - [ - "SUBSYSTEM==\"net\"", - "ACTION==\"add\"", - "DRIVERS==\"?*\"", - "ATTR{address}==\"#{dev_mac}\"", - "ATTR{type}==\"1\"", - "NAME=\"#{dev_name}\"" - ] - end - - # Updates existing key in a rule to new value. - # Modifies rule and returns it. - # If key is not found, rule is unchanged. - def update_udev_rule_key(rule, key, value) - return rule if rule.nil? || rule.empty? - - raise ArgumentError if key.nil? - raise ArgumentError if value.nil? - - i = rule.find_index { |k| k =~ /^#{key}/ } - - if i - rule[i] = rule[i].gsub(/#{key}={1,2}"([^"]*)"/) do |m| - m.gsub(Regexp.last_match(1), value) - end - end - - rule - end - - # Returns a value of the particular key in the rule - # - # @param rule [array] an udev rule represented as a list of strings - # @param key [string] a key name which is asked for value - # @return [string] value corresponding to the key or empty string - def udev_key_value(rule, key) - raise ArgumentError, "Rule must not be nil when querying a key value" if rule.nil? - - rule.each do |tuple| - # note that when using =~ then named capture groups (?...) currently - # cannot be used together with interpolation (#{}) - # see http://stackoverflow.com/questions/15890729/why-does-capturing-named-groups-in-ruby-result-in-undefined-local-variable-or-m - matches = tuple.match(/#{key}={1,2}"?(?[^[:space:]"]*)/) - return matches[:value] if matches - end - - "" - end - - # Writes new persistent udev net rules and tells udevd to update its configuration - def write_update_udevd(udev_rules) - SCR.Write(path(".udev_persistent.rules"), udev_rules) - SCR.Write(path(".udev_persistent.nil"), []) - - update_udevd - end - - # Tells udevd to reload and update its configuration - # - # @return [boolean] false when new configuration cannot be activated - def update_udevd - SCR.Execute(path(".target.bash"), "/usr/bin/udevadm control --reload") - - # When configuring a new s390 card, we neglect to fill - # its Items[i, "udev", "net"], causing jumbled names (bnc#721520) - # The udev trigger will make udev write the persistent names - # (which it already has done, but we have overwritten them now). - ret = SCR.Execute( - path(".target.bash"), - "/usr/bin/udevadm trigger --subsystem-match=net --action=add" - ) - ret.zero? - end - - # Removes (key,operator,value) tripplet from given udev rule. - def RemoveKeyFromUdevRule(rule, key) - pattern = /#{key}={1,2}\S*/ - - rule.delete_if { |tripplet| tripplet =~ pattern } - end - - # Adds (key, operator, value) tripplet into given udev rule - # - # Tripplet is given as a string in form KEY="VALUE" or - # MATCHKEY=="MATCHVALUE" - def AddToUdevRule(rule, tripplet) - return rule unless tripplet =~ /.+={1,2}\".*\"/ - - rule ||= [] - rule + [tripplet] - end - end -end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 17a60aba5..9678eeb8b 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -739,15 +739,8 @@ def Import(settings) # @return dumped settings def Export profile = Y2Network::AutoinstProfile::NetworkingSection.new_from_network(yast_config) - devices = NetworkInterfaces.Export("") - udev_rules = LanItems.export(devices) ay = { "dns" => profile.dns ? profile.dns.to_hashes : {}, - "s390-devices" => Ops.get_map( - udev_rules, - "s390-devices", - {} - ), "net-udev" => profile.udev_rules ? profile.udev_rules.udev_rules.map(&:to_hashes) : [], "config" => NetworkConfig.Export, "interfaces" => profile.interfaces ? profile.interfaces.interfaces.map(&:to_hashes) : [], diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 9191c421d..782eaed96 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -65,7 +65,6 @@ def main Yast.include self, "network/complex.rb" Yast.include self, "network/routines.rb" Yast.include self, "network/lan/s390.rb" - Yast.include self, "network/lan/udev.rb" reset_cache @@ -543,115 +542,6 @@ def current_renamed? renamed?(@current) end - # Writes udev rules for all items. - # - # Currently only interesting change is renaming interface. - def WriteUdevItemsRules - # loop over all items and checks if device name has changed - net_rules = [] - - Builtins.foreach( - Convert.convert( - Map.Keys(@Items), - from: "list", - to: "list " - ) - ) do |key| - item_udev_net = GetItemUdevRule(key) - next if IsEmpty(item_udev_net) - dev_name = Ops.get_string(@Items, [key, "hwinfo", "dev_name"], "") - @current = key - if dev_name != GetItemUdev("NAME") - # when changing device name you have a choice - # - change kernel "match rule", or - # - remove it completely - # removing is less error prone when tracking name changes, so it was chosen. - item_udev_net = RemoveKeyFromUdevRule(item_udev_net, "KERNEL") - # setting links down during AY is forbidden bcs it can freeze ssh installation - SetIfaceDown(dev_name) if !Mode.autoinst - - @force_restart = true - end - net_rules = Builtins.add( - net_rules, - Builtins.mergestring(item_udev_net, ", ") - ) - end - - Builtins.y2milestone("write net udev rules: %1", net_rules) - - write_update_udevd(net_rules) - - true - end - - def WriteUdevDriverRules - udev_drivers_rules = {} - - Builtins.foreach( - Convert.convert( - Map.Keys(@Items), - from: "list", - to: "list " - ) - ) do |key| - driver = Ops.get_string(@Items, [key, "udev", "driver"], "") - if IsNotEmpty(driver) - modalias = Ops.get_string(@Items, [key, "hwinfo", "modalias"], "") - driver_rule = [] - - driver_rule = AddToUdevRule( - driver_rule, - Builtins.sformat("ENV{MODALIAS}==\"%1\"", modalias) - ) - driver_rule = AddToUdevRule( - driver_rule, - Builtins.sformat("ENV{MODALIAS}=\"%1\"", driver) - ) - - Ops.set(udev_drivers_rules, driver, driver_rule) - end - end - - Builtins.y2milestone("write drivers udev rules: %1", udev_drivers_rules) - - SCR.Write(path(".udev_persistent.drivers"), udev_drivers_rules) - - # write rules from driver - Builtins.foreach( - Convert.convert( - @driver_options, - from: "map ", - to: "map " - ) - ) do |key, value| - val = {} - Builtins.foreach(Builtins.splitstring(value, " ")) do |k| - l = Builtins.splitstring(k, "=") - Ops.set(val, Ops.get(l, 0, ""), Ops.get(l, 1, "")) - end - val = nil if IsEmpty(value) - SCR.Write(Builtins.add(path(".modules.options"), key), val) - end - - SCR.Write(path(".modules"), nil) - - nil - end - - def WriteUdevRules - WriteUdevItemsRules() - WriteUdevDriverRules() - - # wait so that ifcfgs written in NetworkInterfaces are newer - # (1-second-wise) than netcontrol status files, - # and rcnetwork reload actually works (bnc#749365) - SCR.Execute(path(".target.bash"), "/usr/bin/udevadm settle") - sleep(1) - - nil - end - def write renamed_items = @Items.keys.select { |item_id| renamed?(item_id) } renamed_items.each do |item_id| @@ -660,16 +550,6 @@ def write NetworkInterfaces.Change2(renamed_to(item_id), devmap, false) if devmap SetItemName(item_id, renamed_to(item_id)) end - - LanItems.WriteUdevRules if !Stage.cont && InstallInfConvertor.instance.AllowUdevModify - end - - # Exports configuration for use in AY profile - # - # TODO: it currently exports only udevs (as a consequence of dropping LanUdevAuto) - # so once it is extended, all references has to be checked - def export(devices) - export_udevs(devices) end # Function which returns if the settings were modified @@ -1931,112 +1811,6 @@ def drop_hosts(ip) Host.remove_ip(ip) end - # Exports udev rules for AY profile - def export_udevs(devices) - devices = deep_copy(devices) - ay = { "s390-devices" => {}, "net-udev" => {} } - if Arch.s390 - devs = [] - Builtins.foreach( - Convert.convert(devices, from: "map", to: "map ") - ) do |_type, value| - devs = Convert.convert( - Builtins.union(devs, Map.Keys(Convert.to_map(value))), - from: "list", - to: "list " - ) - end - Builtins.foreach(devs) do |device| - begin - driver = File.readlink("/sys/class/net/#{device}/device/driver") - rescue SystemCallError => e - Builtins.y2error("Failed to read driver #{e.inspect}") - next - end - driver = File.basename(driver) - device_type = "" - chanids = "" - case driver - when "qeth" - device_type = driver - when "ctcm" - device_type = "ctc" - when "netiucv" - device_type = "iucv" - else - Builtins.y2error("unknown driver type :#{driver}") - end - chan_ids = SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "for i in $(seq 0 2); do chanid=$(/usr/bin/ls -l /sys/class/net/%1/device/cdev$i); /usr/bin/echo ${chanid##*/}; done | /usr/bin/tr '\n' ' '", - device.shellescape - ) - ) - if !chan_ids["stdout"].empty? - chanids = String.CutBlanks(Ops.get_string(chan_ids, "stdout", "")) - end - - # we already know that kernel device exist, otherwise next above would apply - # FIXME: It seems that it is not always the case (bsc#1124002) - portname_file = "/sys/class/net/#{device}/device/portname" - portname = ::File.exist?(portname_file) ? ::File.read(portname_file).strip : "" - - protocol_file = "/sys/class/net/#{device}/device/protocol" - protocol = ::File.exist?(protocol_file) ? ::File.read(protocol_file).strip : "" - - layer2_ret = SCR.Execute( - path(".target.bash"), - Builtins.sformat( - "/usr/bin/grep -q 1 /sys/class/net/%1/device/layer2", - device.shellescape - ) - ) - layer2 = layer2_ret == 0 - Ops.set(ay, ["s390-devices", device], "type" => device_type) - Ops.set(ay, ["s390-devices", device, "chanids"], chanids) if !chanids.empty? - Ops.set(ay, ["s390-devices", device, "portname"], portname) if !portname.empty? - Ops.set(ay, ["s390-devices", device, "protocol"], protocol) if !protocol.empty? - Ops.set(ay, ["s390-devices", device, "layer2"], true) if layer2 - port0 = SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "port0=$(/usr/bin/ls -l /sys/class/net/%1/device/cdev0); /usr/bin/echo ${port0##*/} | /usr/bin/tr -d '\n'", - device - ) - ) - Builtins.y2milestone("port0 %1", port0) - if !port0["stdout"].empty? - value = Ops.get_string(port0, "stdout", "") - Ops.set( - ay, - ["net-udev", device], - "rule" => "KERNELS", "name" => device, "value" => value - ) - end - end - else - configured = Items().select { |i, _| IsItemConfigured(i) } - ay["net-udev"] = configured.keys.each_with_object({}) do |id, udev| - @current = id # for GetItemUdev - - name = GetItemUdev("NAME").to_s - rule = ["ATTR{address}", "KERNELS"].find { |r| !GetItemUdev(r).to_s.empty? } - - next if !rule || name.empty? - - udev[name] = { - "rule" => rule, - "name" => name, - "value" => GetItemUdev(rule) - } - end - end - - Builtins.y2milestone("AY profile %1", ay) - deep_copy(ay) - end - # Searches available items according sysconfig option # # Expects a block. The block is provided @@ -2117,7 +1891,6 @@ def yast_config publish function: :GetItemUdevRule, type: "list (integer)" publish function: :GetItemUdev, type: "string (string)" publish function: :ReplaceItemUdev, type: "list (string, string, string)" - publish function: :WriteUdevRules, type: "void ()" publish function: :GetModified, type: "boolean ()" publish function: :SetModified, type: "void ()" publish function: :AddNew, type: "void ()" diff --git a/test/lan_items_export_test.rb b/test/lan_items_export_test.rb deleted file mode 100755 index 3a081226c..000000000 --- a/test/lan_items_export_test.rb +++ /dev/null @@ -1,121 +0,0 @@ -#!/usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -require "yast" - -Yast.import "LanItems" -Yast.import "Arch" - -describe "LanItemsClass#export_udevs" do - subject { Yast::LanItems } - - let(:devices) do - { - "eth" => { - "eth0" => {} - } - } - end - - let(:scr) { Yast::SCR } - - let(:is_s390) { false } - - let(:eth0) do - { - "hwinfo" => { "dev_name" => "eth0" }, - "udev" => { - "net" => [ - "SUBSYSTEM==\"net\"", "ACTION==\"add\"", "DRIVERS==\"?*\"", "ATTR{type}==\"1\"", - "ATTR{address}==\"00:50:56:12:34:56\"", "NAME=\"eth0\"" - ] - } - } - end - - let(:eth1) do - { - "hwinfo" => { "dev_name" => "eth1" }, - "udev" => { - "net" => [ - "SUBSYSTEM==\"net\"", "ACTION==\"add\"", "DRIVERS==\"?*\"", - "KERNELS==\"0000:00:1f.6\"", "NAME=\"eth1\"" - ] - } - } - end - - let(:items) { { 0 => eth0, 1 => eth1 } } - - before(:each) do - # mock SCR to not touch system - allow(scr).to receive(:Read).and_return("") - allow(scr).to receive(:Execute).and_return("exit" => -1, "stdout" => "", "stderr" => "") - allow(subject).to receive(:IsItemConfigured).and_return(true) - allow(subject).to receive(:Items).and_return(items) - end - - before(:each) do - allow(Yast::Arch).to receive(:s390).and_return(is_s390) - end - - it "exports udev rules" do - ay = subject.send(:export_udevs, devices) - expect(ay["net-udev"]).to eq( - "eth0" => { "rule" => "ATTR{address}", "name" => "eth0", "value" => "00:50:56:12:34:56" }, - "eth1" => { "rule" => "KERNELS", "name" => "eth1", "value" => "0000:00:1f.6" } - ) - end - - context "when an interface is not configured" do - before do - allow(subject).to receive(:IsItemConfigured).with(1).and_return(false) - end - - it "does not include an udev rule for that interface" do - ay = subject.send(:export_udevs, devices) - expect(ay["net-udev"].keys).to eq(["eth0"]) - end - end - - context "When running on s390" do - let(:is_s390) { true } - - # kind of smoke test - it "produces s390 specific content in exported AY profile" do - allow(::File) - .to receive(:readlink) - .and_return("../../../qeth") - - allow(::File) - .to receive(:read) - .and_return("") - - ay = subject.send(:export_udevs, devices) - - expect(ay["s390-devices"]).not_to be_empty - # check if the export builds correct map - expect(ay["s390-devices"]["eth0"]["type"]).to eql "qeth" - end - end -end diff --git a/test/udev_test.rb b/test/udev_test.rb deleted file mode 100755 index be68667b4..000000000 --- a/test/udev_test.rb +++ /dev/null @@ -1,173 +0,0 @@ -#!/usr/bin/env rspec - -# Copyright (c) [2019] SUSE LLC -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact SUSE LLC. -# -# To contact SUSE LLC about this file by physical or electronic mail, you may -# find current contact information at www.suse.com. - -require_relative "test_helper" - -require "yast" - -Yast.import "LanItems" -Yast.import "Stage" - -# mock class only for testing include -class NetworkLanComplexUdev < Yast::Module - def initialize - Yast.include self, "network/lan/udev" - end -end - -describe "NetworkLanUdevInclude#update_udev_rule_key" do - subject { NetworkLanComplexUdev.new } - - let(:default_rule) do - subject.GetDefaultUdevRule("default1", "00:11:22:33:44:55") - end - - it "updates existing assignment key to new value" do - new_name = "renamed2" - - updated_rule = subject.update_udev_rule_key( - default_rule, - "NAME", - new_name - ) - expect(updated_rule).to include "NAME=\"#{new_name}\"" - end - - it "updates existing comparison key to new value" do - new_subsystem = "hdd" - - updated_rule = subject.update_udev_rule_key( - default_rule, - "SUBSYSTEM", - new_subsystem - ) - expect(updated_rule).to include "SUBSYSTEM==\"#{new_subsystem}\"" - end - - it "returns unchanged rule when key is not found" do - updated_rule = subject.update_udev_rule_key( - default_rule, - "NONEXISTENT_UDEV_KEY", - "value" - ) - expect(updated_rule).to eq default_rule - end -end - -describe "#udev_rule_key" do - let(:rule) { ["KERNELS==\"invalid\"", "KERNEL==\"eth*\"", "NAME=\"eth1\""] } - - it "raises ArgumentError if given rule is empty" do - expect { Yast::LanItems.udev_key_value(nil, "KERNEL") } - .to raise_error(ArgumentError, "Rule must not be nil when querying a key value") - end - - it "returns value of the first attribute which matches given key" do - expect(Yast::LanItems.udev_key_value(rule, "KERNEL")).to eql("eth*") - end - - it "returns an empty string if no rule matches" do - expect(Yast::LanItems.udev_key_value(rule, "ATTR{address}")).to eql("") - end -end - -describe "NetworkLanUdevInclude#AddToUdevRule" do - subject(:udev) { NetworkLanComplexUdev.new } - - let(:rule) { ["KERNELS==\"invalid\"", "KERNEL==\"eth*\"", "NAME=\"eth1\""] } - - it "adds new tripled into existing rule" do - updated_rule = udev.AddToUdevRule(rule, "ENV{MODALIAS}==\"e1000\"") - expect(updated_rule).to include "ENV{MODALIAS}==\"e1000\"" - end -end - -describe "NetworkLanUdevInclude#RemoveKeyFromUdevRule" do - subject(:udev) { NetworkLanComplexUdev.new } - - let(:rule) { ["KERNELS==\"invalid\"", "KERNEL==\"eth*\"", "NAME=\"eth1\""] } - - it "removes tripled from existing rule" do - updated_rule = udev.RemoveKeyFromUdevRule(rule, "KERNEL") - expect(updated_rule).not_to include "KERNEL=\"eth*\"" - end -end - -describe "LanItems#ReplaceItemUdev" do - let(:rule) { [] } - let(:items) { { 0 => { "udev" => { "net" => rule } } } } - let(:mac_address) { "xx:01:02:03:04:05" } - - before(:each) do - Yast::LanItems.current = 0 - - # LanItems should create "udev" and "net" subkeys for each item - # during Read - allow(Yast::LanItems).to receive(:Items).and_return(items) - end - - context "when the given Item hasn't got an udev rule" do - let(:items) { { 0 => {} } } - let(:default_rule) { Yast::LanItems.GetDefaultUdevRule("eth1", mac_address) } - - it "creates and assings a new rule for the given Item" do - allow(Yast::LanItems).to receive(:getUdevFallback).and_return(default_rule) - - expect(Yast::LanItems).to receive(:SetModified) - - updated_rule = Yast::LanItems.ReplaceItemUdev("KERNELS", "ATTR{address}", mac_address) - item_rule = Yast::LanItems.getCurrentItem["udev"]["net"] - - expect(updated_rule).to include "ATTR{address}==\"#{mac_address}\"" - expect(item_rule).to include "ATTR{address}==\"#{mac_address}\"" - end - end - - context "when the given Item has got an udev rule" do - let(:rule) { ["ATTR==\"#{mac_address}\"", "KERNEL==\"eth*\"", "NAME=\"eth1\""] } - let(:bus_id) { "0000:08:00.0" } - - it "replaces triplet in the rule as requested" do - expect(Yast::LanItems).to receive(:SetModified) - - updated_rule = Yast::LanItems.ReplaceItemUdev("ATTR{address}", "KERNELS", bus_id) - item_rule = Yast::LanItems.getCurrentItem["udev"]["net"] - - expect(updated_rule).to include "KERNELS==\"#{bus_id}\"" - expect(updated_rule).not_to include "ATTR{address}==\"#{mac_address}\"" - expect(item_rule).to include "KERNELS==\"#{bus_id}\"" - expect(item_rule).not_to include "ATTR{address}==\"#{mac_address}\"" - end - - it "does not set modification flag in case of no change" do - Yast::LanItems.ReplaceItemUdev("ATTR{address}", "ATTR{address}", mac_address) - - expect(Yast::LanItems).not_to receive(:SetModified) - end - - # this is an SCR limitation - it "contains NAME tuplet at last position" do - updated_rule = Yast::LanItems.ReplaceItemUdev("ATTR{address}", "KERNELS", bus_id) - - expect(updated_rule.last).to match(/NAME.*/) - end - end -end From e66b59b830b2ff6ce885df9bdb71fb0fc8afe60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 11:11:23 +0100 Subject: [PATCH 402/471] Drop LanItems#BuildLanOverview --- src/modules/LanItems.rb | 122 ------------------------------- test/build_lan_overview_test.rb | 124 -------------------------------- test/netcard_test.rb | 50 ------------- 3 files changed, 296 deletions(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 782eaed96..2bed2f51e 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -1043,126 +1043,6 @@ def ip_overview(dev_map) bullets end - # FIXME: side effect: sets @type. No reason for that. It should only build item - # overview. Check and remove. - def BuildLanOverview - overview = [] - links = [] - - LanItems.Items.each_key do |key| - rich = "" - - item_hwinfo = LanItems.Items[key]["hwinfo"] || {} - descr = item_hwinfo["name"] || "" - - note = "" - bullets = [] - ifcfg_name = LanItems.Items[key]["ifcfg"] || "" - ifcfg_type = NetworkInterfaces.GetType(ifcfg_name) - - if !ifcfg_name.empty? - ifcfg_conf = GetDeviceMap(key) - log.error("BuildLanOverview: devmap for #{key}/#{ifcfg_name} is nil") if ifcfg_conf.nil? - - ifcfg_desc = ifcfg_conf["NAME"] - descr = ifcfg_desc if !ifcfg_desc.nil? && !ifcfg_desc.empty? - descr = CheckEmptyName(ifcfg_type, descr) - status = DeviceStatus(ifcfg_type, ifcfg_name, ifcfg_conf) - - bullets << _("Device Name: %s") % ifcfg_name - bullets += startmode_overview(key) - bullets += ip_overview(ifcfg_conf) if ifcfg_conf["STARTMODE"] != "managed" - - if ifcfg_type == "wlan" && - ifcfg_conf["WIRELESS_AUTH_MODE"] == "open" && - IsEmpty(ifcfg_conf["WIRELESS_KEY_0"]) - - # avoid colons - ifcfg_name = ifcfg_name.tr(":", "/") - href = "lan--wifi-encryption-" + ifcfg_name - # interface summary: WiFi without encryption - warning = HTML.Colorize(_("Warning: no encryption is used."), "red") - # Hyperlink: Change the configuration of an interface - status << " " << warning << " " << Hyperlink(href, _("Change.")) - links << href - end - - if ifcfg_type == "bond" || ifcfg_type == "br" - bullets << slaves_desc(ifcfg_type, ifcfg_name) - end - - if enslaved?(ifcfg_name) - if yast_config.interfaces.bond_index[ifcfg_name] - master = yast_config.interfaces.bond_index[ifcfg_name] - master_desc = _("Bonding master") - else - master = yast_config.interfaces.bridge_index[ifcfg_name] - master_desc = _("Bridge") - end - note = format(_("enslaved in %s"), master) - bullets << format("%s: %s", master_desc, master) - end - - if renamed?(key) - note = format("%s -> %s", GetDeviceName(key), renamed_to(key)) - end - - overview << Summary.Device(descr, status) - else - descr = CheckEmptyName(ifcfg_type, descr) - overview << Summary.Device(descr, Summary.NotConfigured) - end - conn = "" - conn = HTML.Bold(format("(%s)", _("Not connected"))) if !item_hwinfo["link"] - conn = HTML.Bold(format("(%s)", _("No hwinfo"))) if item_hwinfo.empty? - - mac_dev = HTML.Bold("MAC : ") + item_hwinfo["permanent_mac"].to_s + "
    " - bus_id = HTML.Bold("BusID : ") + item_hwinfo["busid"].to_s + "
    " - physical_port_id = HTML.Bold("PhysicalPortID : ") + physical_port_id(ifcfg_name) + "
    " - - rich << " " << conn << "
    " << mac_dev if IsNotEmpty(item_hwinfo["permanent_mac"]) - rich << bus_id if IsNotEmpty(item_hwinfo["busid"]) - rich << physical_port_id if physical_port_id?(ifcfg_name) - # display it only if we need it, don't duplicate "ifcfg_name" above - if IsNotEmpty(item_hwinfo["dev_name"]) && ifcfg_name.empty? - dev_name = _("Device Name: %s") % item_hwinfo["dev_name"] - rich << HTML.Bold(dev_name) << "
    " - end - rich = HTML.Bold(descr) + rich - if IsEmpty(item_hwinfo["dev_name"]) && !item_hwinfo.empty? && !Arch.s390 - rich << "

    " - rich << _("Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details.") - rich << "

    " - elsif !ifcfg_name.empty? - rich << HTML.List(bullets) - else - rich << "

    " - rich << _("The device is not configured. Press Edit\nto configure.\n") - rich << "

    " - - curr = @current - @current = key - if needFirmwareCurrentItem - fw = GetFirmwareForCurrentItem() - rich << format("%s : %s", _("Needed firmware"), !fw.empty? ? fw : _("unknown")) - end - @current = curr - end - LanItems.Items[key]["table_descr"] = { - "rich_descr" => rich, - "table_descr" => [descr, DeviceProtocol(ifcfg_conf), ifcfg_name, note] - } - end - [Summary.DevicesList(overview), links] - end - - # Create an overview table with all configured devices - # @return table items - def Overview - BuildLanOverview() - GetDescr() - end - # Is current device hotplug or not? I.e. is connected via usb/pcmci? def isCurrentHotplug hotplugtype = Ops.get_string(getCurrentItem, ["hwinfo", "hotplug"], "") @@ -1903,8 +1783,6 @@ def yast_config publish function: :needFirmwareCurrentItem, type: "boolean ()" publish function: :GetFirmwareForCurrentItem, type: "string ()" publish function: :GetBondSlaves, type: "list (string)" - publish function: :BuildLanOverview, type: "list ()" - publish function: :Overview, type: "list ()" publish function: :isCurrentHotplug, type: "boolean ()" publish function: :isCurrentDHCP, type: "boolean ()" publish function: :GetItemDescription, type: "string ()" diff --git a/test/build_lan_overview_test.rb b/test/build_lan_overview_test.rb index ad8148543..f09686e9c 100755 --- a/test/build_lan_overview_test.rb +++ b/test/build_lan_overview_test.rb @@ -27,130 +27,6 @@ include Yast::I18n -describe "LanItemsClass#BuildLanOverview" do - let(:unknown_device_overview) do - ["

    • Unknown Network Device
      Not configured yet.

    ", []] - end - let(:german_translation_overview) do - [ - "

    • WiFi Link 6000 Series
      Ohne Adresse konfiguriert (KEINE) Warnung: Es wird keine Verschl\u00FCsselung verwendet. \u00C4ndern Sie dies.

    ", - ["lan--wifi-encryption-wlan0"] - ] - end - let(:wlan_items) do - { - 0 => { - "ifcfg" => "wlan0" - } - } - end - let(:wlan_ifcfg) do - { - "BOOTPROTO" => "none", - "NAME" => "WiFi Link 6000 Series", - "WIRELESS_AUTH_MODE" => "open", - "WIRELESS_KEY_0" => "" - } - end - let(:lan_items) do - { - 0 => { "hwinfo" => { - "name" => "Ethernet Card 0", - "type" => "eth", - "udi" => "", - "sysfs_id" => "/devices/pci0000:00/0000:00:03.0/virtio0", - "dev_name" => "eth0", - "requires" => [], - "modalias" => "virtio:d00000001v00001AF4", - "unique" => "vWuh.VIRhsc57kTD", - "driver" => "virtio_net", - "num" => 0, - "active" => true, - "module" => "virtio_net", - "bus" => "Virtio", - "busid" => "virtio0", - "mac" => "02:00:00:12:34:56", - "link" => true - }, - "udev" => { - "net" => ["SUBSYSTEM==\"net\"", "ACTION==\"add\"", "DRIVERS==\"virtio-pci\"", - "ATTR{dev_id}==\"0x0\"", "KERNELS==\"0000:00:03.0\"", - "ATTR{type}==\"1\"", "KERNEL==\"eth*\"", "NAME=\"eth0\""], - "driver" => "" - }, - "ifcfg" => "eth0" } - } - end - let(:lan_ifcfg) do - { "STARTMODE" => "nfsroot", - "BOOTPROTO" => "dhcp", - "DHCLIENT_SET_DEFAULT_ROUTE" => "yes" } - end - let(:interfaces) { Y2Network::InterfacesCollection.new([]) } - - before do - allow(Y2Network::Config) - .to receive(:find) - .and_return(instance_double(Y2Network::Config, interfaces: interfaces)) - end - - # targeted mainly against bnc#906694 - context "with an wlan interface" do - before do - allow(Yast::LanItems) - .to receive(:Items) - .and_return(wlan_items) - allow(Yast::LanItems) - .to receive(:GetDeviceMap) - .and_return(wlan_ifcfg) - allow(Yast::NetworkInterfaces) - .to receive(:Current) - .and_return(wlan_ifcfg) - allow(Yast::NetworkInterfaces) - .to receive(:GetType) - .and_call_original - allow(Yast::NetworkInterfaces) - .to receive(:GetType) - .with("wlan0") - .and_return("wlan") - allow(FastGettext) - .to receive(:locale) - .and_return("de") - end - it "returns translated network device textual description for wlan device" do - # locale search path - stub_const("Yast::I18n::LOCALE_DIR", File.expand_path("../locale", __FILE__)) - - textdomain("network") - - # other checks depends on this - # - output of BuildLanOverview changes according number of devices - # even for "failing" (unknown devices) path - expect(Yast::LanItems.Items.size).to eql 1 - - overview = Yast::LanItems.BuildLanOverview - expect(overview).not_to eql unknown_device_overview - expect(overview).to eql german_translation_overview - end - end - - context "with an lan interface" do - before do - allow(Yast::LanItems).to receive(:Items) - .and_return(lan_items) - allow(Yast::LanItems).to receive(:GetDeviceMap) - .and_return(lan_ifcfg) - allow(Yast::NetworkInterfaces).to receive(:Current) - .and_return(lan_ifcfg) - end - it "returns description for lan device with the correct start option" do - Yast::LanItems.BuildLanOverview - expect(Yast::LanItems.Items.size).to eql 1 - expect(Yast::LanItems.Items[0]["table_descr"]["rich_descr"].include?("Started automatically at boot")).to eql(true) - end - end -end - describe "LanItemsClass#ip_overview" do # smoke test for bnc#1013684 it "do not crash when devmap for staticaly configured device do not contain PREFIXLEN" do diff --git a/test/netcard_test.rb b/test/netcard_test.rb index 822a22ace..7f1c2e621 100755 --- a/test/netcard_test.rb +++ b/test/netcard_test.rb @@ -157,56 +157,6 @@ def initialize end end -describe "LanItemsClass#BuildLanOverview" do - let(:interfaces) { Y2Network::InterfacesCollection.new([]) } - - before(:each) do - @lan_items = Yast::LanItems - @lan_items.main - @lan_items.Items = Yast.deep_copy(MOCKED_ITEMS) - - allow(Y2Network::Config) - .to receive(:find) - .and_return(instance_double(Y2Network::Config, interfaces: interfaces)) - end - - it "returns description and uses custom name if present" do - allow(@lan_items).to receive(:GetDeviceMap) { { "NAME" => "Custom name" } } - - @lan_items.BuildLanOverview - @lan_items.Items.each_pair do |_key, value| - # it is not issue, really same index two times - desc = value["table_descr"]["table_descr"].first - - if value["ifcfg"] - expect(desc).to eql "Custom name" - else - expect(desc).not_to be_empty - end - end - end - - it "returns description and uses type based name if hwinfo is not present" do - allow(@lan_items).to receive(:GetDeviceMap) { { "NAME" => "" } } - - @lan_items.BuildLanOverview - @lan_items.Items.each_pair do |_key, value| - desc = value["table_descr"]["table_descr"].first - - if !value["hwinfo"] - dev_name = value["ifcfg"].to_s - dev_type = Yast::NetworkInterfaces.GetType(dev_name) - expected_dev_desc = Yast::NetworkInterfaces.GetDevTypeDescription(dev_type, true) - else - expected_dev_desc = value["hwinfo"]["name"] - end - - expect(desc).not_to be_empty - expect(desc).to eql expected_dev_desc - end - end -end - describe "LanItemsClass#DeleteItem" do before(:each) do @lan_items = Yast::LanItems From b33d756d2ca46aca5da82f97b6c85877cbbf62c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 11:25:07 +0100 Subject: [PATCH 403/471] Remove call to LanItems.current_udev_name --- test/y2network/widgets/udev_rules_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/y2network/widgets/udev_rules_test.rb b/test/y2network/widgets/udev_rules_test.rb index f083ce833..0d6915c1d 100644 --- a/test/y2network/widgets/udev_rules_test.rb +++ b/test/y2network/widgets/udev_rules_test.rb @@ -32,7 +32,6 @@ let(:dialog) { instance_double(Y2Network::Dialogs::RenameInterface, run: dialog_ret) } before do - allow(Yast::LanItems).to receive(:current_udev_name).and_return("hell666") allow(Y2Network::Dialogs::RenameInterface).to receive(:new).and_return(dialog) end From e6ecc3b01488671eda8b14f410cdacd8952b34db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 11:37:58 +0100 Subject: [PATCH 404/471] Remove udev/rename handling methods from LanItems --- src/modules/LanItems.rb | 362 +-------------------------------- test/lan_items_helpers_test.rb | 236 --------------------- test/netcard_test.rb | 17 +- 3 files changed, 2 insertions(+), 613 deletions(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 2bed2f51e..12327bf21 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -175,22 +175,6 @@ def GetDeviceName(item_id) "" # this should never happen end - # Convenience method to obtain the current Item udev rule - # - # @return [Array] Item udev rule - def current_udev_rule - LanItems.GetItemUdevRule(LanItems.current) - end - - # Returns name which is going to be used in the udev rule - def current_udev_name - if LanItems.current_renamed? - LanItems.current_renamed_to - else - LanItems.GetItemUdev("NAME") - end - end - # transforms given list of item ids onto device names # # item id is index into internal @Items structure @@ -270,286 +254,8 @@ def SetItemSysconfigOpt(item_id, opt, value) SetDeviceMap(item_id, devmap) end - # Returns udev rule known for particular item - # - # @param itemId [Integer] a key for {#Items} - def GetItemUdevRule(itemId) - Ops.get_list(GetLanItem(itemId), ["udev", "net"], []) - end - - # Sets udev rule for given item - # - # @param itemId [Integer] a key for {#Items} - # @param rule [String] an udev rule - def SetItemUdevRule(itemId, rule) - GetLanItem(itemId)["udev"]["net"] = rule - end - - # Inits item's udev rule to a default one if none is present - # - # @param item_id [Integer] a key for {#Items} - # @return [String] item's udev rule - def InitItemUdevRule(item_id) - udev = GetItemUdevRule(item_id) - return udev if !udev.empty? - - default_mac = GetLanItem(item_id).fetch("hwinfo", {})["permanent_mac"] - raise ArgumentError, "Cannot propose udev rule - NIC not present" if !default_mac - - default_udev = GetDefaultUdevRule( - GetDeviceName(item_id), - default_mac - ) - SetItemUdevRule(item_id, default_udev) - - default_udev - end - - def ReadUdevDriverRules - Builtins.y2milestone("Reading udev rules ...") - @udev_net_rules = Convert.convert( - SCR.Read(path(".udev_persistent.net")), - from: "any", - to: "map " - ) - - Builtins.y2milestone("Reading driver options ...") - Builtins.foreach(SCR.Dir(path(".modules.options"))) do |driver| - pth = Builtins.sformat(".modules.options.%1", driver) - Builtins.foreach( - Convert.convert( - SCR.Read(Builtins.topath(pth)), - from: "any", - to: "map " - ) - ) do |key, value| - Ops.set( - @driver_options, - driver, - Builtins.sformat( - "%1%2%3=%4", - Ops.get_string(@driver_options, driver, ""), - if Ops.greater_than( - Builtins.size(Ops.get_string(@driver_options, driver, "")), - 0 - ) - " " - else - "" - end, - key, - value - ) - ) - end - end - - true - end - - def getUdevFallback - udev_rules = Ops.get_list(getCurrentItem, ["udev", "net"], []) - - if IsEmpty(udev_rules) - udev_rules = GetDefaultUdevRule( - GetCurrentName(), - Ops.get_string(getCurrentItem, ["hwinfo", "permanent_mac"], "") - ) - Builtins.y2milestone( - "No Udev rules found, creating default: %1", - udev_rules - ) - end - - deep_copy(udev_rules) - end - - # It returns a value for the particular key of udev rule belonging to the current item. - def GetItemUdev(key) - udev_key_value(getUdevFallback, key) - end - - # It deletes the given key from the udev rule of the current item. - # - # @param key [string] udev key which identifies the tuple to be removed - # @return [Object, nil] the current item's udev rule without the given key; nil if - # there is not udev rules for the current item - def RemoveItemUdev(key) - return nil if current_udev_rule.empty? - - log.info("Removing #{key} from #{current_udev_rule}") - Items()[@current]["udev"]["net"] = - LanItems.RemoveKeyFromUdevRule(current_udev_rule, key) - end - - # Updates the udev rule of the current Lan Item based on the key given - # which currently could be mac or bus_id. - # - # In case of bus_id the dev_port will be always added to avoid cases where - # the interfaces shared the same bus_id (i.e. Multiport cards using the - # same function to all the ports) (bsc#1007172) - # - # @param based_on [Symbol] principal key to be matched, `:mac` or `:bus_id` - # @return [void] - def update_item_udev_rule!(based_on = :mac) - new_rule = current_udev_rule.empty? - LanItems.InitItemUdevRule(LanItems.current) if new_rule - - case based_on - when :mac - return if new_rule - - LanItems.RemoveItemUdev("ATTR{dev_port}") - - # FIXME: While the user is able to modify the udev rule using the - # mac address instead of bus_id when bonding, could be that the - # mac in use was not the permanent one. We could read it with - # ethtool -P dev_name} - LanItems.ReplaceItemUdev( - "KERNELS", - "ATTR{address}", - LanItems.getCurrentItem.fetch("hwinfo", {}).fetch("permanent_mac", "") - ) - when :bus_id - # Update or insert the dev_port if the sysfs dev_port attribute is present - LanItems.ReplaceItemUdev( - "ATTR{dev_port}", - "ATTR{dev_port}", - LanItems.dev_port(LanItems.GetCurrentName) - ) if LanItems.dev_port?(LanItems.GetCurrentName) - - # If the current rule is mac based, overwrite to bus id. Don't touch otherwise. - LanItems.ReplaceItemUdev( - "ATTR{address}", - "KERNELS", - LanItems.getCurrentItem.fetch("hwinfo", {}).fetch("busid", "") - ) - else - raise ArgumentError, "The key given for udev rule #{based_on} is not supported" - end - end - - # It replaces a tuple identified by replace_key in current item's udev rule - # - # Note that the tuple is identified by key only. However modification flag is - # set only if value was changed (in case when replace_key == new_key) - # - # It also contain a logic on tuple operators. When the new_key is "NAME" - # then assignment operator (=) is used. Otherwise equality operator (==) is used. - # Thats bcs this function is currently used for touching "NAME", "KERNELS" and - # `ATTR{address}` keys only - # - # @param replace_key [string] udev key which identifies tuple to be replaced - # @param new_key [string] new key to by used - # @param new_val [string] value for new key - # @return updated rule when replace_key is found, current rule otherwise - def ReplaceItemUdev(replace_key, new_key, new_val) - # = for assignment - # == for equality checks - operator = new_key == "NAME" ? "=" : "==" - rule = RemoveKeyFromUdevRule(getUdevFallback, replace_key) - - # NAME="devname" has to be last in the rule. - # otherwise SCR agent .udev_persistent.net returns crap - # isn't that fun - name_tuple = rule.pop - new_rule = AddToUdevRule(rule, "#{new_key}#{operator}\"#{new_val}\"") - new_rule.push(name_tuple) - - if current_udev_rule.sort != new_rule.sort - SetModified() - - log.info("ReplaceItemUdev: new udev rule = #{new_rule}") - - Items()[@current]["udev"] = { "net" => [] } if !Items()[@current]["udev"] - Items()[@current]["udev"]["net"] = new_rule - end - - deep_copy(new_rule) - end - - # Updates device name. - # - # It updates device's udev rules and config name. - # Updating config name means that old configuration is deleted from - # the system. - # - # @param itemId [Integer] a key for {#Items} - # - # Returns new name - def SetItemName(itemId, name) - lan_items = LanItems.Items - - if name && !name.empty? - if lan_items[itemId]["udev"] - updated_rule = update_udev_rule_key(GetItemUdevRule(itemId), "NAME", name) - lan_items[itemId]["udev"]["net"] = updated_rule - end - else - # rewrite rule for empty name is meaningless - lan_items[itemId].delete("udev") - end - - if lan_items[itemId].key?("ifcfg") - NetworkInterfaces.Delete2(lan_items[itemId]["ifcfg"]) - lan_items[itemId]["ifcfg"] = name.to_s - end - - name - end - - # Updates current device name. - # - # It updates device's udev rules and config name. - # Updating config name means that old configuration is deleted from - # the system. - # - # Returns new name - def SetCurrentName(name) - SetItemName(@current, name) - end - - # Sets new device name for current item - def rename(name) - if GetCurrentName() != name - @Items[@current]["renamed_to"] = name - SetModified() - else - @Items[@current].delete("renamed_to") - end - end - - # Returns new name for current item - # - # @param item_id [Integer] a key for {#Items} - def renamed_to(item_id) - Items()[item_id]["renamed_to"] - end - - def current_renamed_to - renamed_to(@current) - end - - # Tells if current item was renamed - # - # @param item_id [Integer] a key for {#Items} - def renamed?(item_id) - return false if !renamed_to(item_id) - renamed_to(item_id) != GetDeviceName(item_id) - end - - def current_renamed? - renamed?(@current) - end - def write - renamed_items = @Items.keys.select { |item_id| renamed?(item_id) } - renamed_items.each do |item_id| - devmap = GetDeviceMap(item_id) - # change configuration name if device is configured - NetworkInterfaces.Change2(renamed_to(item_id), devmap, false) if devmap - SetItemName(item_id, renamed_to(item_id)) - end + # TODO Remove end # Function which returns if the settings were modified @@ -752,50 +458,6 @@ def ReadHw @Items = {} @Hardware = ReadHardware("netcard") # Hardware = [$["active":true, "bus":"pci", "busid":"0000:02:00.0", "dev_name":"wlan0", "drivers":[$["active":true, "modprobe":true, "modules":[["ath5k" , ""]]]], "link":true, "mac":"00:22:43:37:55:c3", "modalias":"pci:v0000168Cd0000001Csv00001A3Bsd00001026bc02s c00i00", "module":"ath5k", "name":"AR242x 802.11abg Wireless PCI Express Adapter", "num":0, "options":"", "re quires":[], "sysfs_id":"/devices/pci0000:00/0000:00:1c.1/0000:02:00.0", "type":"wlan", "udi":"/org/freedeskto p/Hal/devices/pci_168c_1c", "wl_auth_modes":["open", "sharedkey", "wpa-psk", "wpa-eap"], "wl_bitrates":nil, " wl_channels":["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"], "wl_enc_modes":["WEP40", "WEP104", "T KIP", "CCMP"]], $["active":true, "bus":"pci", "busid":"0000:01:00.0", "dev_name":"eth0", "drivers":[$["active ":true, "modprobe":true, "modules":[["atl1e", ""]]]], "link":false, "mac":"00:23:54:3f:7c:c3", "modalias":"pc i:v00001969d00001026sv00001043sd00008324bc02sc00i00", "module":"atl1e", "name":"L1 Gigabit Ethernet Adapter", "num":1, "options":"", "requires":[], "sysfs_id":"/devices/pci0000:00/0000:00:1c.3/0000:01:00.0", "type":"et h", "udi":"/org/freedesktop/Hal/devices/pci_1969_1026", "wl_auth_modes":nil, "wl_bitrates":nil, "wl_channels" :nil, "wl_enc_modes":nil]]; - ReadUdevDriverRules() - - udev_drivers_rules = Convert.convert( - SCR.Read(path(".udev_persistent.drivers")), - from: "any", - to: "map " - ) - Builtins.foreach(@Hardware) do |hwitem| - udev_net = if Ops.get_string(hwitem, "dev_name", "") != "" - Ops.get_list( - @udev_net_rules, - Ops.get_string(hwitem, "dev_name", ""), - [] - ) - else - [] - end - mod = Builtins.deletechars( - Ops.get( - Builtins.splitstring( - Ops.get( - Ops.get_list( - udev_drivers_rules, - Ops.get_string(hwitem, "modalias", ""), - [] - ), - 1, - "" - ), - "=" - ), - 1, - "" - ), - "\"" - ) - Ops.set( - @Items, - Builtins.size(@Items), - "hwinfo" => hwitem, - "udev" => { "net" => udev_net, "driver" => mod } - ) - end - nil end @@ -1227,8 +889,6 @@ def DeleteItem # We have to remove it from routing before deleting the item remove_current_device_from_routing - SetCurrentName("") - current_item = @Items[@current] if current_item["hwinfo"].nil? || current_item["hwinfo"].empty? @@ -1591,22 +1251,6 @@ def enslaved?(ifcfg_name) false end - # Return the current name of the {LanItems} given - # - # @param item_id [Integer] a key for {#Items} - def current_name_for(item_id) - renamed?(item_id) ? renamed_to(item_id) : GetDeviceName(item_id) - end - - # Finds a LanItem which name is in collision to the provided name - # - # @param name [String] a device name (eth0, ...) - # @return [Integer, nil] item id (see LanItems::Items) - def colliding_item(name) - item_id, _item_map = Items().find { |i, _| name == current_name_for(i) } - item_id - end - # Return wether the routing devices list needs to be updated or not to include # the current interface name # @@ -1768,9 +1412,6 @@ def yast_config publish function: :GetCurrentName, type: "string ()" publish function: :GetDeviceType, type: "string (integer)" publish function: :GetDeviceMap, type: "map (integer)" - publish function: :GetItemUdevRule, type: "list (integer)" - publish function: :GetItemUdev, type: "string (string)" - publish function: :ReplaceItemUdev, type: "list (string, string, string)" publish function: :GetModified, type: "boolean ()" publish function: :SetModified, type: "void ()" publish function: :AddNew, type: "void ()" @@ -1791,7 +1432,6 @@ def yast_config publish function: :Select, type: "boolean (string)" publish function: :Commit, type: "boolean ()" publish function: :Rollback, type: "boolean ()" - publish function: :DeleteItem, type: "void ()" publish function: :setDriver, type: "void (string)" publish function: :enableCurrentEditButton, type: "boolean ()" publish function: :createS390Device, type: "boolean ()" diff --git a/test/lan_items_helpers_test.rb b/test/lan_items_helpers_test.rb index b03e0bd04..5648e7809 100755 --- a/test/lan_items_helpers_test.rb +++ b/test/lan_items_helpers_test.rb @@ -156,208 +156,6 @@ end end -describe "LanItems#InitItemUdev" do - def udev_rule(mac, name) - [ - "SUBSYSTEM==\"net\"", - "ACTION==\"add\"", - "DRIVERS==\"?*\"", - "ATTR{address}==\"#{mac}\"", - "ATTR{type}==\"1\"", - "NAME=\"#{name}\"" - ] - end - - before(:each) do - allow(Yast::LanItems) - .to receive(:Items) - .and_return( - 0 => { - "ifcfg" => "eth0", - "udev" => { - "net" => udev_rule("24:be:05:ce:1e:91", "eth0") - } - }, - 1 => { - "hwinfo" => { - "permanent_mac" => "00:00:00:00:00:01", - "dev_name" => "eth1" - }, - # always exists - "udev" => { - "net" => [] - } - } - ) - end - - it "returns existing udev rule if there is any already" do - expect(Yast::LanItems.InitItemUdevRule(0)).to eql udev_rule("24:be:05:ce:1e:91", "eth0") - end - - it "creates new udev rule if none is present" do - expect(Yast::LanItems.InitItemUdevRule(1)).to eql udev_rule("00:00:00:00:00:01", "eth1") - end -end - -describe "LanItems#GetItemUdev" do - def check_GetItemUdev(key, expected_value) - expect(Yast::LanItems.GetItemUdev(key)).to eql expected_value - end - - context "when current item has an udev rule associated" do - BUSID = "0000:00:00.0".freeze - - before(:each) do - allow(Yast::LanItems) - .to receive(:getCurrentItem) - .and_return("udev" => { "net" => ["KERNELS==\"#{BUSID}\""] }) - end - - it "returns proper value when key exists" do - check_GetItemUdev("KERNELS", BUSID) - end - - it "returns an empty string when key doesn't exist" do - check_GetItemUdev("NAME", "") - end - end - - context "when current item doesn't have an udev rule associated" do - MAC = "00:11:22:33:44:55".freeze - - before(:each) do - allow(Yast::LanItems) - .to receive(:GetLanItem) - .and_return("hwinfo" => { "permanent_mac" => MAC }, "ifcfg" => "eth0") - end - - it "returns proper value when key exists" do - check_GetItemUdev("ATTR{address}", MAC) - end - - it "returns an empty string when key doesn't exist" do - check_GetItemUdev("KERNELS", "") - end - end -end - -describe "LanItems#RemoveItemUdev" do - let(:rule) { { 0 => { "udev" => { "net" => ["KEY_TO_DELETE==\"VALUE\"", "OTHER_KEY"] } } } } - before(:each) do - Yast::LanItems.Items = rule - Yast::LanItems.current = 0 - end - - context "when the current item has an udev rule associated" do - it "removes the given key from the current rule if exists" do - Yast::LanItems.RemoveItemUdev("KEY_TO_DELETE") - - expect(Yast::LanItems.GetItemUdevRule(0)).to eql(["OTHER_KEY"]) - end - - it "the current rule keeps untouched if the given key does not exist" do - Yast::LanItems.RemoveItemUdev("NOT_PRESENT_KEY") - - expect(Yast::LanItems.GetItemUdevRule(0)) - .to eql(["KEY_TO_DELETE==\"VALUE\"", "OTHER_KEY"]) - end - end - - context "when the current item doesn't have an udev rule associated" do - let(:rule) { { 0 => { "ifcfg" => "eth0" } } } - - it "returns nil" do - expect(Yast::LanItems.RemoveItemUdev("KEY_TO_DELETE")).to eql(nil) - end - end -end - -describe "#current_udev_rule" do - let(:busid) { "0000:08:00.0" } - let(:hwinfo) { { "dev_name" => "test0", "busid" => busid, "permanent_mac" => "24:be:05:ce:1e:91" } } - let(:udev_net) { ["KERNELS==\"#{busid}\"", "NAME=\"test0\""] } - let(:rule) { { 0 => { "hwinfo" => hwinfo, "udev" => { "net" => udev_net } } } } - - before do - Yast::LanItems.Items = rule - Yast::LanItems.current = 0 - end - - it "returns the current item udev rule" do - expect(Yast::LanItems.current_udev_rule).to contain_exactly("KERNELS==\"#{busid}\"", "NAME=\"test0\"") - end -end - -describe "#update_item_udev_rule!" do - let(:hwinfo) { { "dev_name" => "test0", "busid" => "0000:08:00.0", "permanent_mac" => "24:be:05:ce:1e:91" } } - let(:udev_net) { ["ATTR{address}==\"24:be:05:ce:1e:91\"", "KERNEL==\"eth*\"", "NAME=\"test0\""] } - let(:rule) { { 0 => { "hwinfo" => hwinfo, "udev" => { "net" => udev_net } } } } - - before do - Yast::LanItems.Items = rule - Yast::LanItems.current = 0 - # The current item hasn't got a dev_port - allow(Yast::LanItems).to receive(:dev_port).and_return("") - end - - context "when the given rule key is :bus_id" do - it "uses KERNELS attribute with busid match instead of mac address" do - expect(Yast::LanItems.Items[0]["udev"]["net"]).to eql(udev_net) - Yast::LanItems.update_item_udev_rule!(:bus_id) - expect(Yast::LanItems.Items[0]["udev"]["net"]) - .to eql(["KERNEL==\"eth*\"", "KERNELS==\"0000:08:00.0\"", "NAME=\"test0\""]) - end - - context "and the dev_port is available via sysfs" do - it "also adds the dev_port to the current rule" do - allow(Yast::LanItems).to receive(:dev_port).and_return("0") - expect(Yast::LanItems.Items[0]["udev"]["net"]).to eql(udev_net) - Yast::LanItems.update_item_udev_rule!(:bus_id) - expect(Yast::LanItems.Items[0]["udev"]["net"]) - .to eql(["KERNEL==\"eth*\"", "ATTR{dev_port}==\"0\"", "KERNELS==\"0000:08:00.0\"", "NAME=\"test0\""]) - end - end - end - - context "when the given rule key is :mac" do - let(:udev_net) { ["KERNEL==\"eth*\"", "KERNELS==\"0000:08:00.0\"", "NAME=\"test0\""] } - - it "uses mac attribute" do - expect(Yast::LanItems.Items[0]["udev"]["net"]).to eql(udev_net) - Yast::LanItems.update_item_udev_rule!(:mac) - expect(Yast::LanItems.Items[0]["udev"]["net"]) - .to eql(["KERNEL==\"eth*\"", "ATTR{address}==\"24:be:05:ce:1e:91\"", "NAME=\"test0\""]) - end - - context "and the current item has got a dev port" do - let(:udev_net) { ["KERNEL==\"eth*\"", "ATTR{dev_port}==\"0\"", "KERNELS==\"0000:08:00.0\"", "NAME=\"test0\""] } - - it "removes the dev_port from current rule if present" do - expect(Yast::LanItems.Items[0]["udev"]["net"]).to eql(udev_net) - Yast::LanItems.update_item_udev_rule!(:mac) - expect(Yast::LanItems.Items[0]["udev"]["net"]) - .to eql(["KERNEL==\"eth*\"", "ATTR{address}==\"24:be:05:ce:1e:91\"", "NAME=\"test0\""]) - end - end - end - - context "when not supported key is given" do - it "raises an ArgumentError exception" do - expect { Yast::LanItems.update_item_udev_rule!(:other) }.to raise_error(ArgumentError) - end - end - - context "when no parameters is given" do - it "uses :mac as default" do - expect(Yast::LanItems).to receive(:RemoveItemUdev).with("ATTR{dev_port}") - expect(Yast::LanItems).to receive(:ReplaceItemUdev) - - Yast::LanItems.update_item_udev_rule! - end - end -end - describe "LanItems#find_type_ifaces" do let(:mocked_items) do { @@ -620,40 +418,6 @@ def mock_dhcp_setup(ifaces, global) allow(Yast::LanItems).to receive(:Items).and_return(0 => item_0) end - describe "LanItems#current_name_for" do - context "when the LanItem has not been renamed" do - it "returns the item name" do - expect(Yast::LanItems.current_name_for(0)).to eql "eth0" - end - end - - context "when the LanItem has been renamed" do - let(:renamed_to) { "new1" } - - it "returns the new name" do - expect(Yast::LanItems.current_name_for(0)).to eql "new1" - end - end - end - - describe "LanItems#colliding_item" do - it "returns nothing if no collision was found" do - expect(Yast::LanItems.colliding_item("enp0s3")).to be nil - end - - it "returns the Item index which is in collision" do - expect(Yast::LanItems.colliding_item("eth0")).to be 0 - end - - context "if some of the devices were renamed" do - let(:renamed_to) { "enp0s3" } - - it "uses the new name to detect the collision" do - expect(Yast::LanItems.colliding_item("enp0s3")).to be 0 - end - end - end - describe "LanItems.add_device_to_routing" do let(:eth0) { Y2Network::Interface.new("eth0") } let(:wlan0) { Y2Network::Interface.new("wlan0") } diff --git a/test/netcard_test.rb b/test/netcard_test.rb index 7f1c2e621..2711d7a14 100755 --- a/test/netcard_test.rb +++ b/test/netcard_test.rb @@ -179,7 +179,7 @@ def initialize end end - it "removes only the configuration if the item has hwinfo" do + xit "removes only the configuration if the item has hwinfo" do before_size = @lan_items.Items.size item_name = "enp0s3" @@ -212,21 +212,6 @@ def initialize end end -describe "LanItemsClass#SetItemName" do - subject { Yast::LanItems } - let(:new_name) { "new_name" } - - # this test covers bnc#914833 - it "doesn't try to update udev rules when none exists for the item" do - allow(subject) - .to receive(:Items) - .and_return(MOCKED_ITEMS) - - item_id = subject.Items.find { |_k, v| !v.key?("udev") }.first - expect(subject.SetItemName(item_id, new_name)).to eql new_name - end -end - describe "LanItemsClass#FindAndSelect" do before(:each) do @lan_items = Yast::LanItems From 06a409adb1599915e997b7b1282b520a950c1aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 12:10:26 +0100 Subject: [PATCH 405/471] Drop (temporarily) support to write udev rules in AY --- src/lib/network/clients/save_network.rb | 3 +- src/lib/network/network_autoyast.rb | 113 ---------- test/network_autoyast_test.rb | 280 ------------------------ 3 files changed, 2 insertions(+), 394 deletions(-) diff --git a/src/lib/network/clients/save_network.rb b/src/lib/network/clients/save_network.rb index 9c838124d..2f332b10e 100644 --- a/src/lib/network/clients/save_network.rb +++ b/src/lib/network/clients/save_network.rb @@ -200,7 +200,8 @@ def copy_from_instsys # 1) udev agent doesn't support SetRoot # 2) original ifcfg file is copied otherwise too. It doesn't break things itself # but definitely not looking well ;-) - NetworkAutoYast.instance.create_udevs if Mode.autoinst + # TODO: implement support for create udev rules if needed + # NetworkAutoYast.instance.create_udevs if Mode.autoinst copy_dhcp_info copy_udev_rules diff --git a/src/lib/network/network_autoyast.rb b/src/lib/network/network_autoyast.rb index 78aa28175..63d97eba6 100644 --- a/src/lib/network/network_autoyast.rb +++ b/src/lib/network/network_autoyast.rb @@ -72,39 +72,6 @@ def merge_configs(conf) conf end - # Creates udev rules according definition from profile - def create_udevs - return if !Mode.autoinst - - log.info("Applying udev rules according to AY profile") - - # get implicitly defined udev rules (via old style names) - im_udev_rules = LanItems.createUdevFromIfaceName(ay_networking_section["interfaces"]) - log.info("- implicitly defined udev rules: #{im_udev_rules}") - - no_rules = im_udev_rules.empty? - - # get explicit udev definition from the profile - ex_udev_rules = ay_networking_section["net-udev"] || [] - log.info("- explicitly defined udev rules: #{ex_udev_rules}") - - no_rules &&= ex_udev_rules.empty? - return if no_rules - - # for the purpose of setting the persistent names, create the devices 1st - s390_devices = ay_networking_section.fetch("s390-devices", {}) - s390_devices.each { |rule| LanItems.createS390Device(rule) } if Arch.s390 - - LanItems.Read - - # implicitly defined udev rules are overwritten by explicit ones in - # case of collision. - assign_udevs_to_devs(im_udev_rules) - assign_udevs_to_devs(ex_udev_rules) - - LanItems.write - end - # Sets network service for target def set_network_service return if !Mode.autoinst @@ -294,86 +261,6 @@ def ay_host_section ay_current_profile["host"] end - # Checks if the udev rule is valid for renaming a NIC - def valid_rename_udev_rule?(rule) - return false if rule["name"].nil? || rule["name"].empty? - return false if rule["rule"].nil? || rule["rule"].empty? - return false if rule["value"].nil? || rule["value"].empty? - - true - end - - # Renames a network device represented by given item. - # - # @param item [Integer] is an item id. See LanItems for detail - # @param name_to [String] new device name - # @param attr [String] an udev attribute usable in NIC's rule. Currently just - # "KERNELS" or "ATTR{address}" makes sense. This parameter is optional - # @param key [String] for the given udev attribute. Optional parameter. - def rename_lan_item(item, name_to, attr = nil, key = nil) - return if item.nil? || item < 0 || item >= LanItems.Items.size - return if name_to.nil? || name_to.empty? - - # selecting according device name is unreliable (selects only in between configured devices) - LanItems.current = item - LanItems.InitItemUdevRule(item) - - if !attr.nil? && !key.nil? - # find out what attribude is currently used for setting device name and - # change it if needed. Currently mac is used by default. So, we check is it is - # the other one (busid). If no we defaults to mac. - bus_attr = LanItems.GetItemUdev("KERNELS") - current_attr = bus_attr.empty? ? "ATTR{address}" : "KERNELS" - - # make sure that we base renaming on defined attribute with value given in AY profile - LanItems.ReplaceItemUdev(current_attr, attr, key) - elsif attr.nil? ^ key.nil? # xor - raise ArgumentError, "Not enough data for udev rule definition" - end - - LanItems.rename(name_to) - - nil - end - - # Takes a list of udev rules and assignes them to corresponding devices. - # - # If a device has an udev rule defined already, it is overwritten by new one. - # Note: initialization of LanItems has to be done outside of this method - def assign_udevs_to_devs(udev_rules) - return if udev_rules.nil? - - udev_rules.each do |rule| - name_to = rule["name"] - attr = rule["rule"] - key = rule["value"] - - next if !valid_rename_udev_rule?(rule) - key.downcase! - - # find item which matches to the given rule definition - item_id, matching_item = LanItems.Items.find do |_, i| - next unless i["hwinfo"] - busid = i["hwinfo"]["busid"] - # Match also parent busid if exist (bsc#1129012) - parent_busid = i["hwinfo"]["parent_busid"] || busid - mac = i["hwinfo"]["permanent_mac"] - - [busid, parent_busid, mac].any? { |v| v.casecmp(key).zero? } - end - next if !matching_item - - name_from = LanItems.current_name_for(item_id) - log.info("Matching device found - renaming <#{name_from}> -> <#{name_to}>") - - # rename item in collision - rename_lan_item(LanItems.colliding_item(name_to), name_from) - - # rename matching item - rename_lan_item(item_id, name_to, attr, key) - end - end - # Configures given yast submodule according AY configuration # # It takes data from AY profile transformed into a format expected by the YaST diff --git a/test/network_autoyast_test.rb b/test/network_autoyast_test.rb index c71d42988..122c6acc6 100755 --- a/test/network_autoyast_test.rb +++ b/test/network_autoyast_test.rb @@ -269,286 +269,6 @@ def keep_install_network_value(value) end end - context "When AY profile contains old style name" do - let(:ay_old_id) do - { - "interfaces" => [{ "device" => "eth-bus-0.0.1111" }] - } - end - let(:ay_old_mac) do - { - "interfaces" => [{ "device" => "eth-id-00:11:22:33:44:55" }] - } - end - let(:ay_both_vers) do - { "interfaces" => ay_old_id["interfaces"] + [{ "device" => "eth0" }] } - end - - describe "#createUdevFromIfaceName" do - Yast.import "LanItems" - - subject(:lan_udev_auto) { Yast::LanItems } - - let(:ay_interfaces) { ay_both_vers["interfaces"] + ay_old_mac["interfaces"] } - - before(:each) do - allow(Yast::LanItems).to receive(:getDeviceName).and_return("eth0") - end - - it "returns empty list when no interfaces are provided" do - expect(lan_udev_auto.createUdevFromIfaceName(nil)).to be_empty - expect(lan_udev_auto.createUdevFromIfaceName([])).to be_empty - end - - it "do not modify list of interfaces" do - ifaces = ay_interfaces - - lan_udev_auto.send(:createUdevFromIfaceName, ay_interfaces) - - # note that this function originally filtered non old style interfaces out. - expect(ifaces).to eql ay_interfaces - end - - it "updates udev rules list according old style name" do - udev_list = lan_udev_auto.send(:createUdevFromIfaceName, ay_both_vers["interfaces"]) - - expect(udev_list.first["rule"]).to eql "KERNELS" - expect(udev_list.first["value"]).to eql "0.0.1111" - expect(udev_list.first["name"]).to eql "eth0" - end - end - end - - context "When AY profile doesn't contain old style name" do - let(:ay_only_new) do - { - "interfaces" => [{ "device" => "eth0" }] - } - end - - describe "#createUdevFromIfaceName" do - subject(:lan_udev_auto) { Yast::LanItems } - - it "returns no udev rules" do - ifaces = ay_only_new["interfaces"] - - expect(lan_udev_auto.send(:createUdevFromIfaceName, ifaces)).to be_empty - end - end - end - - describe "#valid_rename_udev_rule?" do - it "fails when the rule do not contain new name" do - rule = { "rule" => "ATTR{address}", "value" => "00:02:29:69:d3:63" } - expect(network_autoyast.send(:valid_rename_udev_rule?, rule)).to be false - expect(network_autoyast.send(:valid_rename_udev_rule?, rule["name"] = "")).to be false - end - - it "fails when the rule do not contain dev attribute" do - rule = { "name" => "eth0", "value" => "00:02:29:69:d3:63" } - expect(network_autoyast.send(:valid_rename_udev_rule?, rule)).to be false - expect(network_autoyast.send(:valid_rename_udev_rule?, rule["rule"] = "")).to be false - end - - it "fails when the rule do not contain dev attribute's value" do - rule = { "name" => "eth0", "rule" => "ATTR{address}" } - expect(network_autoyast.send(:valid_rename_udev_rule?, rule)).to be false - expect(network_autoyast.send(:valid_rename_udev_rule?, rule["value"] = "")).to be false - end - - it "succeedes for complete rule" do - complete_rule = { - "name" => "eth0", - "rule" => "ATTR{address}", - "value" => "00:02:29:69:d3:63" - } - expect(network_autoyast.send(:valid_rename_udev_rule?, complete_rule)).to be true - end - end - - describe "#rename_lan_item" do - before(:each) do - allow(Yast::LanItems) - .to receive(:Items) - .and_return(0 => { "ifcfg" => "eth0", "udev" => { "net" => ["ATTR{address}==\"24:be:05:ce:1e:91\"", "KERNEL==\"eth*\"", "NAME=\"eth0\""] } }) - end - - context "valid arguments given" do - it "renames the item with no udev attribute change" do - expect(Yast::LanItems) - .to receive(:rename) - .with("new_name") - expect(Yast::LanItems) - .not_to receive(:ReplaceItemUdev) - - network_autoyast.send(:rename_lan_item, 0, "new_name") - end - - it "renames the item with udev attribute change" do - expect(Yast::LanItems) - .to receive(:rename) - .with("new_name") - expect(Yast::LanItems) - .to receive(:ReplaceItemUdev) - - network_autoyast.send(:rename_lan_item, 0, "new_name", "KERNELS", "0000:00:03.0") - end - end - - context "invalid arguments given" do - it "do not try to rename an item when missing new name" do - expect(Yast::LanItems) - .not_to receive(:rename) - - network_autoyast.send(:rename_lan_item, 0, nil) - network_autoyast.send(:rename_lan_item, 0, "") - end - - it "do not try to rename an item when given item id is invalid" do - expect(Yast::LanItems) - .not_to receive(:rename) - - network_autoyast.send(:rename_lan_item, nil, "new_name") - network_autoyast.send(:rename_lan_item, -1, "new_name") - network_autoyast.send(:rename_lan_item, 100, "new_name") - end - - it "raise an exception when udev definition is incomplete" do - expect do - network_autoyast.send(:rename_lan_item, 0, "new_name", "KERNELS", nil) - end.to raise_error(ArgumentError) - expect do - network_autoyast.send(:rename_lan_item, 0, "new_name", nil, "0000:00:03.0") - end.to raise_error(ArgumentError) - end - end - end - - context "When creating udev rules based on the AY profile" do - def mock_lan_item(renamed_to: nil) - allow(Yast::LanItems) - .to receive(:Items) - .and_return( - 0 => { - "ifcfg" => "eth0", - "renamed_to" => renamed_to, - "udev" => { - "net" => [ - "ATTR{address}==\"24:be:05:ce:1e:91\"", - "NAME=\"#{renamed_to}\"" - ] - } - } - ) - end - - describe "#assign_udevs_to_devs" do - Yast.import "LanItems" - - let(:udev_rules) do - [ - { - "name" => "eth1", - "rule" => "KERNELS", - "value" => "0000:01:00.0" - }, - { - "name" => "eth3", - "rule" => "KERNELS", - "value" => "0000:01:00.4" - }, - { - "name" => "eth0", - "rule" => "KERNELS", - "value" => "0000:01:00.2" - } - ] - end - - let(:persistent_udevs) do - { - "eth0" => [ - "KERNELS==\"0000:01:00.0\"", - "NAME=eth0" - ], - "eth1" => [ - "KERNELS==\"0000:01:00.1\"", - "NAME=eth1" - ], - "eth2" => [ - "KERNELS==\"0000:01:00.2\"", - "NAME=eth2" - ] - } - end - - let(:hw_netcard) do - [ - { - "dev_name" => "eth0", - "busid" => "0000:01:00.0", - "mac" => "00:00:00:00:00:00", - "permanent_mac" => "00:00:00:00:00:00" - }, - { - "dev_name" => "eth1", - "busid" => "0000:01:00.1", - "mac" => "00:00:00:00:00:01", - "permanent_mac" => "00:00:00:00:00:01" - }, - { - "dev_name" => "eth2", - "busid" => "0000:01:00.2", - "mac" => "00:00:00:00:00:02", - "permanent_mac" => "00:00:00:00:00:02" - } - ] - end - - before(:each) do - allow(Yast::LanItems) - .to receive(:ReadHardware) - .with("netcard") - .and_return(hw_netcard) - allow(Yast::NetworkInterfaces) - .to receive(:Read) - .and_return(true) - # respective agent is not able to change scr root - allow(Yast::SCR) - .to receive(:Read) - .with(path(".udev_persistent.net")) - .and_return(persistent_udevs) - - Yast::LanItems.Read - Yast::LanItems.Items[3] = { "ifcfg" => "eth3" } - end - - # see bnc#1056109 - # - basically dev_name is renamed_to || ifcfg || hwinfo.devname for purposes - # of this test (ifcfg is name distinguished from sysconfig configuration, - # hwinfo.devname is name assigned by kernel during device initialization and - # renamed_to is new device name assigned by user when asking for device renaming - # - updating udev rules) - # - # - when we have devices and ruleset defined in AY profile - # which renames these devices it could, before the fix, happen that after - # applying of the ruleset we could end with new nameset e.g. - # which obviously leads to misconfiguration of the system - it "applies rules so, that names remain unique" do - pending "adapt to new API" - network_autoyast.send(:assign_udevs_to_devs, udev_rules) - - lan_items = Yast::LanItems - names = lan_items.Items.keys.map do |i| - lan_items.renamed?(i) ? lan_items.renamed_to(i) : lan_items.GetDeviceName(i) - end - - # check if device names are unique - expect(names.sort).to eql ["eth0", "eth1", "eth2", "eth3"] - end - end - end - describe "#configure_lan" do before do allow(Yast::Profile).to receive(:current) From 3e46828a4f50f0599cc7ef45e20efa76c5b5d5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Mon, 16 Sep 2019 12:17:12 +0100 Subject: [PATCH 406/471] Drop LanItems.write --- src/lib/network/network_autoconfiguration.rb | 1 - src/modules/Lan.rb | 1 - src/modules/LanItems.rb | 4 ---- test/network_autoconfiguration_test.rb | 3 +-- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/lib/network/network_autoconfiguration.rb b/src/lib/network/network_autoconfiguration.rb index 570107bed..741ee30b1 100644 --- a/src/lib/network/network_autoconfiguration.rb +++ b/src/lib/network/network_autoconfiguration.rb @@ -104,7 +104,6 @@ def configure_virtuals # avoid restarting network (installation can run via ssh, vnc, ...) # Moreover virtual devices are not needed during first stage. So, it can # wait for rebooting into just installed target - LanItems.write return if Lan.yast_config == Lan.system_config Lan.yast_config.write end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 9678eeb8b..5e8015e58 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -510,7 +510,6 @@ def Write(gui: true) return false if Abort() # Progress step 3 - multiple devices may be present, really plural ProgressNextStage(_("Writing device configuration...")) - LanItems.write Builtins.sleep(sl) return false if Abort() diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 12327bf21..491042f92 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -254,10 +254,6 @@ def SetItemSysconfigOpt(item_id, opt, value) SetDeviceMap(item_id, devmap) end - def write - # TODO Remove - end - # Function which returns if the settings were modified # @return [Boolean] settings were modified def GetModified diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index 60f9722a8..b70bec15e 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -201,7 +201,6 @@ def probe_netcard_factory(num) allow(Y2Network::Config).to receive(:find).with(:yast).and_return(yast_config) allow(Y2Network::Config).to receive(:find).with(:system).and_return(system_config) allow(instance).to receive(:virtual_proposal_required?).and_return(proposal) - allow(Yast::LanItems).to receive(:write) allow(Yast::LanItems).to receive(:Read) allow(yast_config).to receive(:write) allow(Yast::Lan).to receive(:connected_and_bridgeable?).and_return(true) @@ -228,7 +227,7 @@ def probe_netcard_factory(num) end it "writes the configuration of the interfaces" do - expect(Yast::LanItems).to receive(:write) + expect(Yast::Lan.yast_config).to receive(:write) instance.configure_virtuals end From 415af392a7667aa99f235070242760a0e6d207fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 17 Sep 2019 11:40:30 +0100 Subject: [PATCH 407/471] Drop unused InterfacesReader#system_interfaces --- src/lib/y2network/autoinst/config_reader.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index 8571ec73c..46194c8d7 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -60,15 +60,6 @@ def config config end - - private - - # Returns an interfaces reader instance - # - # @return [SysconfigInterfaces] Interfaces reader - def system_interfaces - @system_interfaces ||= Y2Network::Sysconfig::InterfacesReader.new - end end end end From 1ebb173c1d77b3b26cd7e839258cd43acb1cbfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 17 Sep 2019 14:55:39 +0100 Subject: [PATCH 408/471] AutoYaST uses the current configuration as reference --- src/lib/y2network/autoinst/config_reader.rb | 6 ++++-- src/lib/y2network/config.rb | 16 +++++++++------- src/lib/y2network/config_reader.rb | 6 +++--- src/modules/Lan.rb | 3 ++- test/y2network/autoinst/config_reader_test.rb | 3 ++- test/y2network/config_test.rb | 2 +- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index 8571ec73c..2074404b2 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -39,13 +39,15 @@ class ConfigReader # Constructor # # @param section [AutoinstProfile::NetworkingSection] - def initialize(section) + # @param system_config [Config] system configuration + def initialize(section, original_config) @section = section + @original_config = original_config end # @return [Y2Network::Config] Network configuration def config - config = Yast::Lan.system_config || Y2Network::Config.new(source: :autoyast) + config = @original_config.copy # apply at first udev rules, so interfaces names are correct UdevRulesReader.new(section.udev_rules).apply(config) if section.udev_rules config.routing = RoutingReader.new(section.routing).config if section.routing diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 8ccc0388c..74aa000c2 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -57,10 +57,10 @@ class Config class << self # @param source [Symbol] Source to read the configuration from - # @param opts [Hash] Reader options. Check readers documentation to find out - # supported options. - def from(source, opts = {}) - reader = ConfigReader.for(source, opts) + # @param *opts [Array] Reader options. Check readers documentation to find out + # supported options. + def from(source, *opts) + reader = ConfigReader.for(source, *opts) reader.config end @@ -113,14 +113,16 @@ def initialize(interfaces: InterfacesCollection.new, connections: ConnectionConf # Writes the configuration into the YaST modules # - # Writes only changes agains original configuration if the original configuration + # Writes only changes against original configuration if the original configuration # is provided # # @param original [Y2Network::Config] configuration used for detecting changes + # @param target [Symbol] Target to write the configuration to (:sysconfig) # # @see Y2Network::ConfigWriter - def write(original: nil) - Y2Network::ConfigWriter.for(source).write(self, original) + def write(original: nil, target: nil) + target ||= source + Y2Network::ConfigWriter.for(target).write(self, original) end # Determines whether two configurations are equal diff --git a/src/lib/y2network/config_reader.rb b/src/lib/y2network/config_reader.rb index 59328ca6b..d7bd75089 100644 --- a/src/lib/y2network/config_reader.rb +++ b/src/lib/y2network/config_reader.rb @@ -21,13 +21,13 @@ module ConfigReader # Config reader for a given source # # @param source [Symbol] Source name (e.g., :sysconfig) - # @param opts [Hash] Reader options + # @param *opts [Array] Reader options # @return [Y2Network::Autoinst::ConfigReader,Y2Network::Sysconfig::ConfigReader] - def self.for(source, opts = {}) + def self.for(source, *opts) require "y2network/#{source}/config_reader" modname = source.to_s.split("_").map(&:capitalize).join klass = Y2Network.const_get("#{modname}::ConfigReader") - klass.new(opts) + klass.new(*opts) end end end diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 17a60aba5..f0562aa21 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -716,8 +716,9 @@ def FromAY(input) def Import(settings) settings = {} if settings.nil? + Lan.Read(:cache) profile = Y2Network::AutoinstProfile::NetworkingSection.new_from_hashes(settings) - config = Y2Network::Config.from(:autoinst, profile) + config = Y2Network::Config.from(:autoinst, profile, system_config) add_config(:yast, config) LanItems.Import(settings) diff --git a/test/y2network/autoinst/config_reader_test.rb b/test/y2network/autoinst/config_reader_test.rb index 639d014c0..5ef272d85 100644 --- a/test/y2network/autoinst/config_reader_test.rb +++ b/test/y2network/autoinst/config_reader_test.rb @@ -26,10 +26,11 @@ require "y2network/sysconfig/interfaces_reader" describe Y2Network::Autoinst::ConfigReader do - let(:subject) { described_class.new(networking_section) } + let(:subject) { described_class.new(networking_section, system_config) } let(:networking_section) do Y2Network::AutoinstProfile::NetworkingSection.new_from_hashes(profile) end + let(:system_config) { Y2Network::Config.new(source: :testing) } let(:eth0) { { "device" => "eth0", "bootproto" => "dhcp", "startmode" => "auto" } } let(:interfaces) { [eth0] } diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 92687b3cb..5534e3882 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -67,7 +67,7 @@ end before do - allow(Y2Network::ConfigReader).to receive(:for).with(:sysconfig, {}) + allow(Y2Network::ConfigReader).to receive(:for).with(:sysconfig) .and_return(reader) end From 98be85f73e07ee767ba4de0f464a313a51dfeb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 17 Sep 2019 14:57:30 +0100 Subject: [PATCH 409/471] Write configuration changes to the running system during 2nd stage --- src/modules/Lan.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index f0562aa21..984ee7e72 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -524,7 +524,8 @@ def Write(gui: true) ProgressNextStage(_("Writing routing configuration...")) orig = Progress.set(false) - yast_config.write(original: system_config) + target = :sysconfig if Mode.auto + yast_config.write(original: system_config, target: target) Progress.set(orig) Builtins.sleep(sl) From aa5e2c32a1d64bf31df9b019c92011f111c415af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 17 Sep 2019 15:05:13 +0100 Subject: [PATCH 410/471] Do not crash when writing changes if old configuration is nil --- src/lib/y2network/sysconfig/config_writer.rb | 4 +--- src/lib/y2network/sysconfig/dns_writer.rb | 10 ++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 6a320336c..1caa672e1 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -36,9 +36,7 @@ class ConfigWriter # @param config [Y2Network::Config] Configuration to write # @param old_config [Y2Network::Config] Old configuration def write(config, old_config = nil) - return unless config.routing - - write_ip_forwarding(config.routing) + write_ip_forwarding(config.routing) if config.routing write_interface_changes(config, old_config) # update /etc/sysconfig/network/routes file diff --git a/src/lib/y2network/sysconfig/dns_writer.rb b/src/lib/y2network/sysconfig/dns_writer.rb index 38b111563..cb3d3eb9d 100644 --- a/src/lib/y2network/sysconfig/dns_writer.rb +++ b/src/lib/y2network/sysconfig/dns_writer.rb @@ -45,21 +45,23 @@ def write(dns, old_dns) # @return [String] Sendmail update script (included in "sendmail" package) SENDMAIL_UPDATE_PATH = "/usr/lib/sendmail.d/update".freeze - def update_sysconfig_dhcp(config, old_config) - if old_config.dhcp_hostname == config.dhcp_hostname + # @param dns [Y2Network::DNS] DNS configuration + # @param old_dns [Y2Network::DNS] Old DNS configuration + def update_sysconfig_dhcp(dns, old_dns) + if old_dns.nil? || old_dns.dhcp_hostname == dns.dhcp_hostname log.info("No update for /etc/sysconfig/network/dhcp") return end Yast::SCR.Write( Yast::Path.new(".sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME"), - config.dhcp_hostname == :any ? "yes" : "no" + dns.dhcp_hostname == :any ? "yes" : "no" ) Yast::SCR.Write(Yast::Path.new(".sysconfig.network.dhcp"), nil) # Clean-up values from ifcfg-* values Y2Network::Sysconfig::InterfaceFile.all.each do |file| - value = file.interface == config.dhcp_hostname ? "yes" : nil + value = file.interface == dns.dhcp_hostname ? "yes" : nil file.load next if file.dhclient_set_hostname == value file.dhclient_set_hostname = value From d71f8387da878bbc83edc4da3e2c6d93d12b48ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Tue, 17 Sep 2019 15:34:44 +0100 Subject: [PATCH 411/471] Documentation fixes --- src/lib/y2network/autoinst/config_reader.rb | 2 +- src/lib/y2network/config.rb | 2 +- src/lib/y2network/config_reader.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index 2074404b2..6b8a3986b 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -39,7 +39,7 @@ class ConfigReader # Constructor # # @param section [AutoinstProfile::NetworkingSection] - # @param system_config [Config] system configuration + # @param original_config [Config] system configuration def initialize(section, original_config) @section = section @original_config = original_config diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 74aa000c2..846fb2ce7 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -57,7 +57,7 @@ class Config class << self # @param source [Symbol] Source to read the configuration from - # @param *opts [Array] Reader options. Check readers documentation to find out + # @param opts [Array] Reader options. Check readers documentation to find out # supported options. def from(source, *opts) reader = ConfigReader.for(source, *opts) diff --git a/src/lib/y2network/config_reader.rb b/src/lib/y2network/config_reader.rb index d7bd75089..81a2d9e53 100644 --- a/src/lib/y2network/config_reader.rb +++ b/src/lib/y2network/config_reader.rb @@ -21,7 +21,7 @@ module ConfigReader # Config reader for a given source # # @param source [Symbol] Source name (e.g., :sysconfig) - # @param *opts [Array] Reader options + # @param opts [Array] Reader options # @return [Y2Network::Autoinst::ConfigReader,Y2Network::Sysconfig::ConfigReader] def self.for(source, *opts) require "y2network/#{source}/config_reader" From 3c02694ebb5897fb492677989464537089a3f9d8 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 00:21:09 +0200 Subject: [PATCH 412/471] detect that connections changed and fix removal of it --- src/lib/y2network/config.rb | 2 +- src/lib/y2network/connection_config/base.rb | 13 +++++++++++++ src/lib/y2network/connection_config/bonding.rb | 6 ++++++ src/lib/y2network/connection_config/bridge.rb | 6 ++++++ src/lib/y2network/connection_config/ctc.rb | 8 ++++++++ src/lib/y2network/connection_config/infiniband.rb | 8 ++++++++ src/lib/y2network/connection_config/lcs.rb | 8 ++++++++ src/lib/y2network/connection_config/qeth.rb | 8 ++++++++ src/lib/y2network/connection_config/tap.rb | 8 ++++++++ src/lib/y2network/connection_config/tun.rb | 8 ++++++++ src/lib/y2network/connection_config/vlan.rb | 8 ++++++++ src/lib/y2network/connection_config/wireless.rb | 11 +++++++++++ .../y2network/connection_configs_collection.rb | 10 ++++++++++ src/lib/y2network/startmode.rb | 2 ++ src/lib/y2network/sysconfig/config_writer.rb | 15 +++++++++++++-- .../sysconfig/connection_config_writer.rb | 8 ++++++++ test/y2network/sysconfig/config_writer_test.rb | 5 +++-- 17 files changed, 129 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 846fb2ce7..b628662e4 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -130,7 +130,7 @@ def write(original: nil, target: nil) # @return [Boolean] true if both configurations are equal; false otherwise def ==(other) source == other.source && interfaces == other.interfaces && - routing == other.routing && dns == other.dns + routing == other.routing && dns == other.dns && connections == other.connections end # Renames a given interface and the associated connections diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index ef2f4fe35..7c3f66bb2 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -71,6 +71,19 @@ def initialize @firewall_zone = "" end + # Compares ConnectionConfigs + # + # @return [Boolean] true when both connections are same + # false otherwise + def ==(other) + [:name, :interface, :bootproto, :ip, :ip_aliases, :mtu, :startmode, + :description, :lladdress, :ethtool_options, :firewall_zone].all? do |method| + public_send(method) == other.public_send(method) + end + end + + alias_method :eql?, :== + PROPOSED_PPPOE_MTU = 1492 # suggested value for PPPoE # Propose reasonable defaults for given config. Useful for newly created devices. diff --git a/src/lib/y2network/connection_config/bonding.rb b/src/lib/y2network/connection_config/bonding.rb index 94d6575f5..6085ed173 100644 --- a/src/lib/y2network/connection_config/bonding.rb +++ b/src/lib/y2network/connection_config/bonding.rb @@ -35,6 +35,12 @@ def initialize @slaves = [] @options = "mode=active-backup miimon=100" end + + def ==(other) + return false unless super + + options == other.options && ((slaves - other.slaves) + (other.slaves - slaves)).empty? + end end end end diff --git a/src/lib/y2network/connection_config/bridge.rb b/src/lib/y2network/connection_config/bridge.rb index c94400ec8..d96956530 100644 --- a/src/lib/y2network/connection_config/bridge.rb +++ b/src/lib/y2network/connection_config/bridge.rb @@ -42,6 +42,12 @@ def initialize def virtual? true end + + def ==(other) + return false unless super + + stp == other.stp && forward_delay == other.forward_delay && ((ports - other.ports) + (other.ports - ports)).empty? + end end end end diff --git a/src/lib/y2network/connection_config/ctc.rb b/src/lib/y2network/connection_config/ctc.rb index 26c9b8cf2..360d3e072 100644 --- a/src/lib/y2network/connection_config/ctc.rb +++ b/src/lib/y2network/connection_config/ctc.rb @@ -53,6 +53,14 @@ class Ctc < Base # @see https://www.ibm.com/support/knowledgecenter/en/linuxonibm/com.ibm.linux.z.ljdd/ljdd_t_ctcm_wrk_protocol.html # @see https://github.com/SUSE/s390-tools/blob/master/ctc_configure#L16 attr_accessor :protocol + + def ==(other) + return false unless super + + [:read_channel, :write_channel, :protocol].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_config/infiniband.rb b/src/lib/y2network/connection_config/infiniband.rb index 4b5dea47d..d07791073 100644 --- a/src/lib/y2network/connection_config/infiniband.rb +++ b/src/lib/y2network/connection_config/infiniband.rb @@ -34,6 +34,14 @@ def initialize self.ipoib_mode = IpoibMode::DEFAULT end + + def ==(other) + return false unless super + + [:ipoib_mode].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_config/lcs.rb b/src/lib/y2network/connection_config/lcs.rb index 58ffe838b..c6c299a7a 100644 --- a/src/lib/y2network/connection_config/lcs.rb +++ b/src/lib/y2network/connection_config/lcs.rb @@ -65,6 +65,14 @@ def initialize @protocol = 0 @timeout = 5 end + + def ==(other) + return false unless super + + [:read_channel, :write_channel, :protocol, :timeout].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_config/qeth.rb b/src/lib/y2network/connection_config/qeth.rb index 4a548c09a..c8004482a 100644 --- a/src/lib/y2network/connection_config/qeth.rb +++ b/src/lib/y2network/connection_config/qeth.rb @@ -56,6 +56,14 @@ def initialize @layer2 = false @port_number = 0 end + + def ==(other) + return false unless super + + [:read_channel, :write_channel, :data_channel, :layer2, :port_number].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_config/tap.rb b/src/lib/y2network/connection_config/tap.rb index bf9e28d2d..cc25fffa3 100644 --- a/src/lib/y2network/connection_config/tap.rb +++ b/src/lib/y2network/connection_config/tap.rb @@ -37,6 +37,14 @@ def initialize def virtual? true end + + def ==(other) + return false unless super + + [:owner, :group].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_config/tun.rb b/src/lib/y2network/connection_config/tun.rb index 458ccc651..5b41fdc6b 100644 --- a/src/lib/y2network/connection_config/tun.rb +++ b/src/lib/y2network/connection_config/tun.rb @@ -37,6 +37,14 @@ def initialize def virtual? true end + + def ==(other) + return false unless super + + [:owner, :group].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_config/vlan.rb b/src/lib/y2network/connection_config/vlan.rb index 596e1a1e8..9a4bad41b 100644 --- a/src/lib/y2network/connection_config/vlan.rb +++ b/src/lib/y2network/connection_config/vlan.rb @@ -36,6 +36,14 @@ class Vlan < Base def virtual? true end + + def ==(other) + return false unless super + + [:parent_device, :vlan_id].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_config/wireless.rb b/src/lib/y2network/connection_config/wireless.rb index 737186ef1..c899d809b 100644 --- a/src/lib/y2network/connection_config/wireless.rb +++ b/src/lib/y2network/connection_config/wireless.rb @@ -90,6 +90,17 @@ def initialize # For WIFI DHCP makes more sense as majority of wifi routers act as dhcp servers self.bootproto = BootProtocol::DHCP end + + def ==(other) + return false unless super + + [:mode, :essid, :nwid, :auth_mode, :wpa_psk, :key_length, :keys, :default_key, :nick, + :eap_mode, :eap_auth, :channel, :frequency, :bitrate, :ap, :ap_scanmode, + :wpa_password, :wpa_identity, :wpa_anonymous_identity, :ca_cert, :client_cert, + :client_key].all? do |method| + public_send(method) == other.public_send(method) + end + end end end end diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index f959d87b4..1f16b32c3 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -84,5 +84,15 @@ def remove(connection_config) name = connection_config.respond_to?(:name) ? connection_config.name : connection_config connection_configs.reject! { |c| c.name == name } end + + # Compares ConnectionConfigsCollection + # + # @return [Boolean] true when both collections contain only equal connections, + # false otherwise + def ==(other) + ((connection_configs - other.connection_configs) + (other.connection_configs - connection_configs)).empty? + end + + alias_method :eql?, :== end end diff --git a/src/lib/y2network/startmode.rb b/src/lib/y2network/startmode.rb index e27017f1e..223e9cd21 100644 --- a/src/lib/y2network/startmode.rb +++ b/src/lib/y2network/startmode.rb @@ -52,5 +52,7 @@ def self.all def ==(other) name == other.name end + + alias_method :eql?, :== end end diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 1caa672e1..453e89cf5 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -31,11 +31,15 @@ module Sysconfig # Ideally, it should be responsible of writing the changes to the underlying # system. But, for the time being, it just relies in {Yast::Routing}. class ConfigWriter + include Yast::Logger + # Writes the configuration into YaST network related modules # # @param config [Y2Network::Config] Configuration to write # @param old_config [Y2Network::Config] Old configuration def write(config, old_config = nil) + log.info "Writing configuration: #{config.inspect}" + log.info "Old configuration: #{old_config.inspect}" write_ip_forwarding(config.routing) if config.routing write_interface_changes(config, old_config) @@ -46,7 +50,7 @@ def write(config, old_config = nil) write_drivers(config.drivers) write_interfaces(config.interfaces) - write_connections(config.connections) + write_connections(config.connections, old_config) write_dns_settings(config, old_config) end @@ -183,8 +187,15 @@ def write_interfaces(interfaces) # @todo Handle old connections (removing those that are needed, etc.) # # @param conns [Array] Connections to write - def write_connections(conns) + # @param old_config [Y2Network::Config,nil] Old configuration; nil if it is unknown + def write_connections(conns, old_config) writer = Y2Network::Sysconfig::ConnectionConfigWriter.new + if old_config + old_connections = old_config.connections + to_remove = old_connections.map(&:name) - conns.map(&:name) + log.info "removing connections #{to_remove.inspect}" + to_remove.each { |name| writer.remove(name) } + end conns.each { |c| writer.write(c) } end diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index 3fb7ee277..90a5c4ed3 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -36,6 +36,14 @@ def write(conn) file.save end + # Removes connection config from the underlying system + # + # @param name [String] Connection name to remove + def remove(name) + ifcfg = Y2Network::Sysconfig::InterfaceFile.find(name) + ifcfg && ifcfg.remove + end + private # Returns the class to handle a given interface type diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 8fa9bee8a..038a29759 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -41,7 +41,7 @@ source: :sysconfig ) end - let(:old_config) { instance_double(Y2Network::Config, dns: double("dns"), interfaces: nil) } + let(:old_config) { instance_double(Y2Network::Config, dns: double("dns"), interfaces: nil, connections: [] ) } let(:ip) { Y2Network::ConnectionConfig::IPConfig.new(address: IPAddr.new("192.168.122.2")) } let(:eth0) { Y2Network::Interface.new("eth0") } let(:eth0_conn) do @@ -138,7 +138,8 @@ instance_double( Y2Network::Config, dns: double("dns"), - interfaces: [eth0, eth1] + interfaces: [eth0, eth1], + connections: [] ) end let(:eth1) { Y2Network::Interface.new("eth1") } From b1a444c5a97f34c51ddaae74f72d3ca5959f047a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 07:08:46 +0100 Subject: [PATCH 413/471] Fix IP aliases handling --- .../y2network/connection_config/ip_config.rb | 3 +- src/lib/y2network/interface_config_builder.rb | 52 ++++++++++--------- .../y2network/widgets/additional_addresses.rb | 2 + .../interface_config_builder_test.rb | 29 +++++++++++ 4 files changed, 61 insertions(+), 25 deletions(-) diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index 61b92ed91..2579b6ca1 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -56,7 +56,8 @@ def initialize(address, id: "", label: nil, remote_address: nil, broadcast: nil) # @return [Boolean] true if both are equal; false otherwise def ==(other) address == other.address && label == other.label && - remote_address == other.remote_address && broadcast == other.broadcast + remote_address == other.remote_address && broadcast == other.broadcast && + id == other.id end end end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index a6a128921..f7bf968d9 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -111,14 +111,9 @@ def newly_added? # down, so here mainly workarounds, but ideally this save should change # completely backend def save - @connection_config.ip_aliases = aliases.each_with_object([]) do |map, result| - ipaddr = IPAddress.from_string(map[:ip]) - ipaddr.prefix = map[:prefixlen].delete("/").to_i if map[:prefixlen] - result << ConnectionConfig::IPConfig.new(ipaddr, label: map[:label]) - end - @connection_config.name = name @connection_config.interface = name + @connection_config.ip_aliases = aliases_to_ip_configs @connection_config.firewall_zone = firewall_zone # create new instance as name can change @@ -403,24 +398,6 @@ def connection_config_klass(type) ConnectionConfig::Base end - # Saves aliases to current connection config object - def save_aliases_to_connection - @connection_config.ip_aliases.clear - aliases.each_with_index do |h, i| - ip_addr = IPAddress.from_string(h[:ip]) - if h[:prefixlen] && !h[:prefixlen].empty? - ip_addr.prefix = h[:prefixlen].delete("/").to_i - elsif h[:mask] && !h[:mask].empty? - ip_addr.netmask = h[:mask] - end - @connection_config.ip_aliases << ConnectionConfig::IPConfig.new( - ip_addr, - label: h[:label], - id: "_#{i}" # TODO: remember original prefixes - ) - end - end - # Sets the interface for the builder # # @param iface [Interface] Interface to associate the builder with @@ -475,5 +452,32 @@ def original_hostname def driver_auto? :auto == driver end + + # Converts aliases in hash form to a list of IPConfig objects + # + # @return [Array] + def aliases_to_ip_configs + last_id = 0 + used_ids = aliases.select { |a| a[:id] && a[:id] =~ /\A\d+\z/ }.map { |a| a[:id].to_i } + aliases.each_with_object([]) do |map, result| + ipaddr = IPAddress.from_string(map[:ip]) + ipaddr.prefix = map[:prefixlen].delete("/").to_i if map[:prefixlen] + id = map[:id] + last_id = id = find_free_alias_id(used_ids, last_id) if id.nil? || id.empty? + result << ConnectionConfig::IPConfig.new(ipaddr, label: map[:label], id: id.to_s) + end + end + + # Returns a free numeric ID for an IP aliases + # + # @param used_ids [Array] Already used IDs + # @param current_id [Integer] Current used ID + def find_free_alias_id(used_ids, last_id) + loop do + last_id += 1 + break unless used_ids.include?(last_id) + end + last_id + end end end diff --git a/src/lib/y2network/widgets/additional_addresses.rb b/src/lib/y2network/widgets/additional_addresses.rb index 1e88a52e9..8dc90dc3c 100644 --- a/src/lib/y2network/widgets/additional_addresses.rb +++ b/src/lib/y2network/widgets/additional_addresses.rb @@ -157,6 +157,7 @@ def handle(event) def dialog(name, entry) label = entry ? entry[:label] : "" ip = entry ? entry[:ip] : "" + id = entry ? entry[:id] : "" mask = if entry entry[:prefixlen].empty? ? entry[:mask] : "/#{entry[:prefixlen]}" else @@ -240,6 +241,7 @@ def dialog(name, entry) end res[:mask] = netmask res[:prefixlen] = prefixlen + res[:id] = id break end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 712ece0b4..7cdb8a5be 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -126,6 +126,35 @@ subject.save end end + + context "when aliases are defined" do + before do + subject.aliases = [ + { id: "1", ip: "192.168.122.100", prefixlen: "/24", label: "alias1" }, + { id: "suffix1", ip: "192.168.123.100", prefixlen: "/24", label: "alias2" }, + { ip: "10.0.0.2", label: "alias3" }, + { id: "", ip: "10.0.0.3", label: "alias4" } + ] + end + + it "sets aliases for the connection config" do + subject.save + expect(subject.connection_config.ip_aliases).to eq([ + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("192.168.122.100/24"), id: "1", label: "alias1" + ), + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("192.168.123.100/24"), id: "suffix1", label: "alias2" + ), + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.2"), id: "2", label: "alias3" + ), + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.3"), id: "3", label: "alias4" + ) + ]) + end + end end describe "#rename_interface" do From c135111723e85eb7aace729c8dc53ddc8f50c120 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 08:29:52 +0200 Subject: [PATCH 414/471] make rubocop happy --- test/y2network/sysconfig/config_writer_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 038a29759..6c88ae2f1 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -41,7 +41,7 @@ source: :sysconfig ) end - let(:old_config) { instance_double(Y2Network::Config, dns: double("dns"), interfaces: nil, connections: [] ) } + let(:old_config) { instance_double(Y2Network::Config, dns: double("dns"), interfaces: nil, connections: []) } let(:ip) { Y2Network::ConnectionConfig::IPConfig.new(address: IPAddr.new("192.168.122.2")) } let(:eth0) { Y2Network::Interface.new("eth0") } let(:eth0_conn) do @@ -137,8 +137,8 @@ let(:old_config) do instance_double( Y2Network::Config, - dns: double("dns"), - interfaces: [eth0, eth1], + dns: double("dns"), + interfaces: [eth0, eth1], connections: [] ) end From e1081c297dab49bdf8053f9cfad851e58ce11f64 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 09:30:14 +0200 Subject: [PATCH 415/471] fix getting bonding device for unconfigured device --- src/lib/y2network/interface_config_builders/bonding.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 4b769df5f..7c252a96f 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -100,6 +100,8 @@ def bondable?(iface) end config = yast_config.connections.by_name(iface.name) + return true unless config # unconfigured device is always bondable + master = config.find_master(yast_config.connections) if master && master.name != name log.debug("Excluding (#{iface.name}) - already has master #{master.inspect}") From 810a2746b863573da7eeed93cb579d319fadbdb3 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 10:00:34 +0200 Subject: [PATCH 416/471] fix changing ifplugd --- src/lib/y2network/widgets/ifplugd_priority.rb | 2 +- test/y2network/widgets/ifplugd_priority_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/ifplugd_priority.rb b/src/lib/y2network/widgets/ifplugd_priority.rb index 1e0f4aacc..b262965df 100644 --- a/src/lib/y2network/widgets/ifplugd_priority.rb +++ b/src/lib/y2network/widgets/ifplugd_priority.rb @@ -58,7 +58,7 @@ def init end def store - @config.ifplugd_priority = value.to_i + @config.ifplugd_priority = value.to_i if enabled? end end end diff --git a/test/y2network/widgets/ifplugd_priority_test.rb b/test/y2network/widgets/ifplugd_priority_test.rb index 0c5e98a33..6be1af5b7 100644 --- a/test/y2network/widgets/ifplugd_priority_test.rb +++ b/test/y2network/widgets/ifplugd_priority_test.rb @@ -56,6 +56,7 @@ describe "#store" do it "sets IFPLUGD_PRIORITY according to widget value as string" do expect(subject).to receive(:value).and_return(20) + expect(subject).to receive(:enabled?).and_return(true) subject.store From fca9f80a93923a0e7d3a53b95c2ea2c153286635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 09:20:49 +0100 Subject: [PATCH 417/471] AdditionalAddresses widget uses the prefix instead of the netmask * The user can still use the netmask, but it will be converted to the corresponding prefix. --- .../y2network/widgets/additional_addresses.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/lib/y2network/widgets/additional_addresses.rb b/src/lib/y2network/widgets/additional_addresses.rb index 8dc90dc3c..f63215e82 100644 --- a/src/lib/y2network/widgets/additional_addresses.rb +++ b/src/lib/y2network/widgets/additional_addresses.rb @@ -19,6 +19,7 @@ require "yast" require "cwm/custom_widget" +require "ipaddr" Yast.import "IP" Yast.import "Popup" @@ -100,8 +101,7 @@ def init def refresh_table table_items = @settings.aliases.each_with_index.map do |data, i| - mask = data[:prefixlen].empty? ? data[:mask] : "/#{data[:prefixlen]}" - Item(Id(i), data[:label], data[:ip], mask) + Item(Id(i), data[:label], data[:ip], "/#{data[:prefixlen]}") end Yast::UI.ChangeWidget(Id(:address_table), :Items, table_items) @@ -158,11 +158,8 @@ def dialog(name, entry) label = entry ? entry[:label] : "" ip = entry ? entry[:ip] : "" id = entry ? entry[:id] : "" - mask = if entry - entry[:prefixlen].empty? ? entry[:mask] : "/#{entry[:prefixlen]}" - else - "" - end + mask = entry ? "/#{entry[:prefixlen]}" : "" + Yast::UI.OpenDialog( Opt(:decorated), VBox( @@ -230,6 +227,7 @@ def dialog(name, entry) Yast::UI.SetFocus(Id(:netmask)) next end + netmask = "" prefixlen = "" if val.start_with?("/") @@ -239,7 +237,12 @@ def dialog(name, entry) else netmask = val end - res[:mask] = netmask + + if prefixlen.empty? + res[:prefixlen] = IPAddr.new("#{netmask}/#{netmask}") + else + res[:prefixlen] = prefixlen + end res[:prefixlen] = prefixlen res[:id] = id From 73f9e8f3bbbe5a5874e062df4dc191adbfb5e177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 09:21:54 +0100 Subject: [PATCH 418/471] Prepend aliases suffixes with an underscore --- src/lib/y2network/interface_config_builder.rb | 11 ++++++++--- test/y2network/interface_config_builder_test.rb | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index f7bf968d9..9d48c2eb5 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -458,13 +458,18 @@ def driver_auto? # @return [Array] def aliases_to_ip_configs last_id = 0 - used_ids = aliases.select { |a| a[:id] && a[:id] =~ /\A\d+\z/ }.map { |a| a[:id].to_i } + used_ids = aliases + .select { |a| a[:id] && a[:id] =~ /\A_?\d+\z/ } + .map { |a| a[:id].sub("_", "").to_i } aliases.each_with_object([]) do |map, result| ipaddr = IPAddress.from_string(map[:ip]) ipaddr.prefix = map[:prefixlen].delete("/").to_i if map[:prefixlen] id = map[:id] - last_id = id = find_free_alias_id(used_ids, last_id) if id.nil? || id.empty? - result << ConnectionConfig::IPConfig.new(ipaddr, label: map[:label], id: id.to_s) + if id.nil? || id.empty? + last_id = id = find_free_alias_id(used_ids, last_id) if id.nil? || id.empty? + id = "_#{id}" + end + result << ConnectionConfig::IPConfig.new(ipaddr, label: map[:label], id: id) end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 7cdb8a5be..1eb593a4e 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -130,7 +130,7 @@ context "when aliases are defined" do before do subject.aliases = [ - { id: "1", ip: "192.168.122.100", prefixlen: "/24", label: "alias1" }, + { id: "_1", ip: "192.168.122.100", prefixlen: "/24", label: "alias1" }, { id: "suffix1", ip: "192.168.123.100", prefixlen: "/24", label: "alias2" }, { ip: "10.0.0.2", label: "alias3" }, { id: "", ip: "10.0.0.3", label: "alias4" } @@ -141,16 +141,16 @@ subject.save expect(subject.connection_config.ip_aliases).to eq([ Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.122.100/24"), id: "1", label: "alias1" + Y2Network::IPAddress.from_string("192.168.122.100/24"), id: "_1", label: "alias1" ), Y2Network::ConnectionConfig::IPConfig.new( Y2Network::IPAddress.from_string("192.168.123.100/24"), id: "suffix1", label: "alias2" ), Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.2"), id: "2", label: "alias3" + Y2Network::IPAddress.from_string("10.0.0.2"), id: "_2", label: "alias3" ), Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.3"), id: "3", label: "alias4" + Y2Network::IPAddress.from_string("10.0.0.3"), id: "_3", label: "alias4" ) ]) end From 639e90c22ddc7390d903137aa357243be0104063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 09:39:47 +0100 Subject: [PATCH 419/471] Keep custom aliases suffixes --- src/lib/y2network/interface_config_builder.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 9d48c2eb5..6f65de754 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -263,6 +263,7 @@ def aliases label: data.label.to_s, ip: data.address.address.to_s, prefixlen: data.address.prefix.to_s, + id: data.id.to_s # NOTE: new API does not have netmask at all, we need to adapt UI to clearly mention only prefix } end @@ -459,7 +460,7 @@ def driver_auto? def aliases_to_ip_configs last_id = 0 used_ids = aliases - .select { |a| a[:id] && a[:id] =~ /\A_?\d+\z/ } + .select { |a| a[:id] && a[:id] =~ /\A_\d+\z/ } .map { |a| a[:id].sub("_", "").to_i } aliases.each_with_object([]) do |map, result| ipaddr = IPAddress.from_string(map[:ip]) From 188644a6b170a79fcbd77ce65fc96ed1bda8c219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 09:43:27 +0100 Subject: [PATCH 420/471] Make RuboCop happy --- src/lib/y2network/interface_config_builder.rb | 4 +-- .../y2network/widgets/additional_addresses.rb | 6 ++-- .../interface_config_builder_test.rb | 30 ++++++++++--------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 6f65de754..71a6c92bb 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -460,8 +460,8 @@ def driver_auto? def aliases_to_ip_configs last_id = 0 used_ids = aliases - .select { |a| a[:id] && a[:id] =~ /\A_\d+\z/ } - .map { |a| a[:id].sub("_", "").to_i } + .select { |a| a[:id] && a[:id] =~ /\A_\d+\z/ } + .map { |a| a[:id].sub("_", "").to_i } aliases.each_with_object([]) do |map, result| ipaddr = IPAddress.from_string(map[:ip]) ipaddr.prefix = map[:prefixlen].delete("/").to_i if map[:prefixlen] diff --git a/src/lib/y2network/widgets/additional_addresses.rb b/src/lib/y2network/widgets/additional_addresses.rb index f63215e82..269378eaf 100644 --- a/src/lib/y2network/widgets/additional_addresses.rb +++ b/src/lib/y2network/widgets/additional_addresses.rb @@ -238,10 +238,10 @@ def dialog(name, entry) netmask = val end - if prefixlen.empty? - res[:prefixlen] = IPAddr.new("#{netmask}/#{netmask}") + res[:prefixlen] = if prefixlen.empty? + IPAddr.new("#{netmask}/#{netmask}") else - res[:prefixlen] = prefixlen + prefixlen end res[:prefixlen] = prefixlen res[:id] = id diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 1eb593a4e..38886bb37 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -139,20 +139,22 @@ it "sets aliases for the connection config" do subject.save - expect(subject.connection_config.ip_aliases).to eq([ - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.122.100/24"), id: "_1", label: "alias1" - ), - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("192.168.123.100/24"), id: "suffix1", label: "alias2" - ), - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.2"), id: "_2", label: "alias3" - ), - Y2Network::ConnectionConfig::IPConfig.new( - Y2Network::IPAddress.from_string("10.0.0.3"), id: "_3", label: "alias4" - ) - ]) + expect(subject.connection_config.ip_aliases).to eq( + [ + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("192.168.122.100/24"), id: "_1", label: "alias1" + ), + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("192.168.123.100/24"), id: "suffix1", label: "alias2" + ), + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.2"), id: "_2", label: "alias3" + ), + Y2Network::ConnectionConfig::IPConfig.new( + Y2Network::IPAddress.from_string("10.0.0.3"), id: "_3", label: "alias4" + ) + ] + ) end end end From 3b55c0fc0f3a039c029321364b9ae24e52486615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 09:49:29 +0100 Subject: [PATCH 421/471] Fix small documentation issue --- src/lib/y2network/interface_config_builder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 71a6c92bb..d907a8aac 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -476,8 +476,8 @@ def aliases_to_ip_configs # Returns a free numeric ID for an IP aliases # - # @param used_ids [Array] Already used IDs - # @param current_id [Integer] Current used ID + # @param used_ids [Array] Already used IDs + # @param last_id [Integer] Last used ID def find_free_alias_id(used_ids, last_id) loop do last_id += 1 From a6a8c88cb4de302f9cebbf4fb82e22fc29f76841 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 12:42:53 +0200 Subject: [PATCH 422/471] add rtest for connection removal --- test/y2network/config_test.rb | 7 +++ .../y2network/sysconfig/config_writer_test.rb | 56 +++++++++++++++---- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 5534e3882..56ff4d87a 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -151,6 +151,13 @@ end end + context "when connection list is different" do + it "returns false" do + copy.connections = Y2Network::ConnectionConfigsCollection.new([]) + expect(copy).to_not eq(config) + end + end + context "when routing information is different" do it "returns false" do copy.routing.forward_ipv4 = !config.routing.forward_ipv4 diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 6c88ae2f1..48660caef 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -41,12 +41,13 @@ source: :sysconfig ) end - let(:old_config) { instance_double(Y2Network::Config, dns: double("dns"), interfaces: nil, connections: []) } + let(:old_config) { Y2Network::Config.new(source: :testing) } let(:ip) { Y2Network::ConnectionConfig::IPConfig.new(address: IPAddr.new("192.168.122.2")) } let(:eth0) { Y2Network::Interface.new("eth0") } let(:eth0_conn) do Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| conn.interface = "eth0" + conn.name = "eth0" conn.bootproto = :static conn.ip = ip end @@ -84,7 +85,6 @@ let(:routes) { [route, default_route] } let(:dns_writer) { instance_double(Y2Network::Sysconfig::DNSWriter, write: nil) } - let(:conn_writer) { instance_double(Y2Network::Sysconfig::ConnectionConfigWriter, write: nil) } let(:interfaces_writer) { instance_double(Y2Network::Sysconfig::InterfacesWriter, write: nil) } before do @@ -96,8 +96,7 @@ .and_return(routes_file) allow(Y2Network::Sysconfig::DNSWriter).to receive(:new) .and_return(dns_writer) - allow(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:new) - .and_return(conn_writer) + allow_any_instance_of(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:write) allow(Y2Network::Sysconfig::InterfacesWriter).to receive(:new) .and_return(interfaces_writer) end @@ -135,11 +134,10 @@ context "when an interface is deleted" do let(:old_config) do - instance_double( - Y2Network::Config, - dns: double("dns"), - interfaces: [eth0, eth1], - connections: [] + Y2Network::Config.new( + dns: double("dns"), + interfaces: Y2Network::InterfacesCollection.new([eth0, eth1]), + source: :testing ) end let(:eth1) { Y2Network::Interface.new("eth1") } @@ -159,6 +157,44 @@ end end + context "when a connection is deleted" do + let(:config) do + Y2Network::Config.new( + interfaces: Y2Network::InterfacesCollection.new([eth0]), + connections: Y2Network::ConnectionConfigsCollection.new([]), + source: :testing + ) + end + + let(:old_config) do + Y2Network::Config.new( + interfaces: Y2Network::InterfacesCollection.new([eth0]), + connections: Y2Network::ConnectionConfigsCollection.new([eth0_conn]), + source: :sysconfig + ) + end + + let(:ifcfg_eth0) do + instance_double(Y2Network::Sysconfig::InterfaceFile).as_null_object + end + + before do + allow(Y2Network::Sysconfig::InterfaceFile).to receive(:find) + .with("eth0") + .and_return(ifcfg_eth0) + + # unconfiguring device will also remove its routes file + allow(Y2Network::Sysconfig::RoutesFile).to receive(:new) + .with("/etc/sysconfig/network/ifroute-eth0") + .and_return(instance_double(Y2Network::Sysconfig::RoutesFile).as_null_object) + end + + it "removes the ifcfg file" do + expect(ifcfg_eth0).to receive(:remove) + writer.write(config, old_config) + end + end + context "When IPv4 forwarding is set" do let(:forward_ipv4) { true } @@ -199,7 +235,7 @@ end it "writes connections configurations" do - expect(conn_writer).to receive(:write).with(eth0_conn) + expect_any_instance_of(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:write).with(eth0_conn) writer.write(config, old_config) end From 894c2b479a49b0576b4086b830c9bd2e4cc4e43f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 12:19:13 +0100 Subject: [PATCH 423/471] Use the permanent MAC address whenever is available --- src/lib/y2network/hwinfo.rb | 21 ++++++++++++++++++++- test/y2network/hwinfo_test.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb index 90e53dafc..24becf93a 100644 --- a/src/lib/y2network/hwinfo.rb +++ b/src/lib/y2network/hwinfo.rb @@ -181,7 +181,7 @@ def initialize(hwinfo = {}) # @return [String,nil] [ { name: "dev_name", default: "" }, - { name: "mac", default: nil }, + { name: "permanent_mac", default: nil }, { name: "busid", default: nil }, { name: "link", default: false }, { name: "driver", default: "" }, @@ -250,6 +250,25 @@ def present? !!type end + # Returns the MAC adress + # + # It usually returns the permanent MAC address (defined in the firmware). However, when + # missing, it will use the current MAC. See bsc#1136929 and bsc#1149234 for the reasons + # behind preferring the permanent MAC address. + # + # @return [String,nil] MAC address + def mac + return permanent_mac unless permanent_mac.nil? || permanent_mac.empty? + used_mac + end + + # MAC address which is being used by the device + # + # @return [String,nil] MAC address + def used_mac + @hwinfo["mac"] + end + # Determines whether two objects are equivalent # # Ignores any element having a nil value. diff --git a/test/y2network/hwinfo_test.rb b/test/y2network/hwinfo_test.rb index 7c348bdd6..6fb08604e 100644 --- a/test/y2network/hwinfo_test.rb +++ b/test/y2network/hwinfo_test.rb @@ -167,4 +167,34 @@ end end end + + describe "#mac" do + before do + allow(hwinfo).to receive(:permanent_mac).and_return(permanent_mac) + end + + context "when the permanent MAC is defined" do + let(:permanent_mac) { "00:11:22:33:44:55" } + + it "returns the permanent MAC" do + expect(hwinfo.mac).to eq(hwinfo.permanent_mac) + end + end + + context "when the permanent MAC is empty" do + let(:permanent_mac) { "" } + + it "returns the current MAC" do + expect(hwinfo.mac).to eq(hwinfo.used_mac) + end + end + + context "when the permanent MAC is not defined" do + let(:permanent_mac) { nil } + + it "returns the current MAC" do + expect(hwinfo.mac).to eq(hwinfo.used_mac) + end + end + end end From ccf8580577c0681129cf4c255ebe77f0437b8755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 15:34:04 +0100 Subject: [PATCH 424/471] Remove unneded code rom tests --- test/network_autoconfiguration_test.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index d220f6dfc..b70bec15e 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -221,11 +221,6 @@ def probe_netcard_factory(num) let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } let(:proposal) { true } - after(:each) do - # some methods might have sideeffects - clen them :-/ - Yast::NetworkInterfaces.Devices.reject! { |k, _| k == "br" } - end - it "creates the virtulization proposal config" do expect(Yast::Lan).to receive(:ProposeVirtualized).and_call_original expect { instance.configure_virtuals }.to change { yast_config.connections.size }.from(0).to(2) From 09f73ba543dc12dca1ef94a930308f8fb8b77489 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 19:40:37 +0200 Subject: [PATCH 425/471] fix crash for virtual device in vlan --- src/lib/y2network/interface_config_builders/vlan.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builders/vlan.rb b/src/lib/y2network/interface_config_builders/vlan.rb index 83c4cd198..1fec33292 100644 --- a/src/lib/y2network/interface_config_builders/vlan.rb +++ b/src/lib/y2network/interface_config_builders/vlan.rb @@ -56,7 +56,7 @@ def possible_vlans yast_config.interfaces.to_a.each_with_object({}) do |interface, result| next if interface.type.vlan? # does not make sense to have vlan of vlan - result[interface.name] = if interface.hardware.present? + result[interface.name] = if interface.hardware && interface.hardware.present? "#{interface.name} - #{interface.hardware.description}" else interface.name From 4b1e9e0705bae511c194b8dcda8c7fa0b937479a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 19:40:58 +0200 Subject: [PATCH 426/471] create properly config for unconfigured bridge and bond slaves --- src/lib/y2network/interface_config_builders/bonding.rb | 4 ++-- src/lib/y2network/interface_config_builders/bridge.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/y2network/interface_config_builders/bonding.rb b/src/lib/y2network/interface_config_builders/bonding.rb index 7c252a96f..9ad608df0 100644 --- a/src/lib/y2network/interface_config_builders/bonding.rb +++ b/src/lib/y2network/interface_config_builders/bonding.rb @@ -65,9 +65,9 @@ def save slaves.each do |slave| interface = yast_config.interfaces.by_name(slave) connection = yast_config.connections.by_name(slave) - next unless connection - next if connection.startmode.name == "none" + next if connection && connection.startmode.name == "none" builder = InterfaceConfigBuilder.for(interface.type, config: connection) + builder.name = interface.name builder.configure_as_slave builder.save end diff --git a/src/lib/y2network/interface_config_builders/bridge.rb b/src/lib/y2network/interface_config_builders/bridge.rb index e3c43846d..f30e616ab 100644 --- a/src/lib/y2network/interface_config_builders/bridge.rb +++ b/src/lib/y2network/interface_config_builders/bridge.rb @@ -54,9 +54,9 @@ def save ports.each do |port| interface = yast_config.interfaces.by_name(port) connection = yast_config.connections.by_name(port) - next unless connection - next if connection.startmode.name == "none" + next if connection && connection.startmode.name == "none" builder = InterfaceConfigBuilder.for(interface.type, config: connection) + builder.name = interface.name builder.configure_as_slave builder.save end From 0e85dfffd863de55311111ab0be84bf5ac4335cd Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 19:46:49 +0200 Subject: [PATCH 427/471] bonding is also virtual --- src/lib/y2network/connection_config/bonding.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/y2network/connection_config/bonding.rb b/src/lib/y2network/connection_config/bonding.rb index 6085ed173..095ae2aac 100644 --- a/src/lib/y2network/connection_config/bonding.rb +++ b/src/lib/y2network/connection_config/bonding.rb @@ -41,6 +41,10 @@ def ==(other) options == other.options && ((slaves - other.slaves) + (other.slaves - slaves)).empty? end + + def virtual? + true + end end end end From 94f5ed1afc88f774ddda2401472e16cf54580dd9 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 19:47:30 +0200 Subject: [PATCH 428/471] vlan is also virtual --- src/lib/y2network/connection_config/dummy.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/y2network/connection_config/dummy.rb b/src/lib/y2network/connection_config/dummy.rb index 505833b3e..0f70ea990 100644 --- a/src/lib/y2network/connection_config/dummy.rb +++ b/src/lib/y2network/connection_config/dummy.rb @@ -23,6 +23,9 @@ module Y2Network module ConnectionConfig # Configuration for dummy connections class Dummy < Base + def virtual? + true + end end end end From d9562a4b0c360490e004d52d3040397ca32b29ee Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 19:58:45 +0200 Subject: [PATCH 429/471] avoid confusing note for vlans --- src/lib/y2network/widgets/interfaces_table.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index f59309d86..9b2f5fdd7 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -81,9 +81,8 @@ def note(interface, conn, config) master = conn.find_master(config.connections) return format(_("enslaved in %s"), master.name) if master - # TODO: maybe add to find master, but then it cannot be used in bond or bridge. Does it reflect reality? if conn.type.vlan? - return format(_("enslaved in %s"), conn.parent_device) + return format(_("parent interface %s"), conn.parent_device) end "" From a3d68489c1b9a4ef96808b6f5cf5bc9a98eb1283 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 19:59:15 +0200 Subject: [PATCH 430/471] comment out crashing code --- src/lib/y2network/connection_config/base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 7c3f66bb2..b7bc5d0f9 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -183,7 +183,8 @@ def hotplug_interface? # if interface is not there return true unless interface - interface.hardware.hotplug + false + # TODO: interface is just string so interface.hardware.hotplug does not work end end end From 254f31c87bb2d590b35478b6a4e2e785cbf1c59b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 20:08:11 +0200 Subject: [PATCH 431/471] fix tap builder name --- src/lib/y2network/interface_config_builders/tap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/interface_config_builders/tap.rb b/src/lib/y2network/interface_config_builders/tap.rb index 85b15134a..a258a60e6 100644 --- a/src/lib/y2network/interface_config_builders/tap.rb +++ b/src/lib/y2network/interface_config_builders/tap.rb @@ -22,7 +22,7 @@ module Y2Network module InterfaceConfigBuilders - class TAP < InterfaceConfigBuilder + class Tap < InterfaceConfigBuilder def initialize(config: nil) super(type: InterfaceType::TAP, config: config) end From 7bdab7be63bc3c697c6b59c21fb11745d14b2c56 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 20:09:44 +0200 Subject: [PATCH 432/471] fix storing vlan id --- src/lib/y2network/widgets/vlan_id.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/vlan_id.rb b/src/lib/y2network/widgets/vlan_id.rb index 98c2283fe..90fbd568a 100644 --- a/src/lib/y2network/widgets/vlan_id.rb +++ b/src/lib/y2network/widgets/vlan_id.rb @@ -42,7 +42,7 @@ def init end def store - @config.vlan_id = value.to_s + @config.vlan_id = value end def minimum From 8d8c3372a741c9803424eaa1e7665145f746ca1d Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 20:10:10 +0200 Subject: [PATCH 433/471] use shorter string to fit into ncurses --- src/lib/y2network/widgets/interfaces_table.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 9b2f5fdd7..260f5f3ac 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -82,7 +82,7 @@ def note(interface, conn, config) return format(_("enslaved in %s"), master.name) if master if conn.type.vlan? - return format(_("parent interface %s"), conn.parent_device) + return format(_("parent: %s"), conn.parent_device) end "" From e8e3449fb5fa9601b38c02cde1e30486474fc03f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 18 Sep 2019 21:08:41 +0200 Subject: [PATCH 434/471] make rubocop happy --- src/lib/y2network/widgets/interfaces_table.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 260f5f3ac..9432be677 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -81,9 +81,7 @@ def note(interface, conn, config) master = conn.find_master(config.connections) return format(_("enslaved in %s"), master.name) if master - if conn.type.vlan? - return format(_("parent: %s"), conn.parent_device) - end + return format(_("parent: %s"), conn.parent_device) if conn.type.vlan? "" end From e4d018a18e8fa6e93553b8aab5690560ccec286d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Mon, 22 Jul 2019 21:51:47 +0100 Subject: [PATCH 435/471] Remove portname --- src/autoyast-rnc/networking.rnc | 1 + src/include/network/lan/hardware.rb | 27 ++++++--------------------- src/include/network/lan/s390.rb | 4 ---- src/modules/LanItems.rb | 9 --------- 4 files changed, 7 insertions(+), 34 deletions(-) diff --git a/src/autoyast-rnc/networking.rnc b/src/autoyast-rnc/networking.rnc index 7ab804e53..c3f19bfb0 100644 --- a/src/autoyast-rnc/networking.rnc +++ b/src/autoyast-rnc/networking.rnc @@ -100,6 +100,7 @@ device = element type { text }? & element layer2 { BOOLEAN}? & element chanids { text }? & + # ignored, present for backward compatibility element portname { text }? & element protocol { text }? & element router { text }? diff --git a/src/include/network/lan/hardware.rb b/src/include/network/lan/hardware.rb index 6e1bc00b9..f797a04f4 100644 --- a/src/include/network/lan/hardware.rb +++ b/src/include/network/lan/hardware.rb @@ -97,19 +97,10 @@ def S390Dialog(builder:) HSpacing(2), VBox( VSpacing(1), - HBox( - # TextEntry label - InputField( - Id(:qeth_portname), - Opt(:hstretch), - _("&Port Name"), - LanItems.qeth_portname - ), - ComboBox( - Id(:qeth_portnumber), - _("Port Number"), - [Item(Id("0"), "0", true), Item(Id("1"), "1")] - ) + ComboBox( + Id(:qeth_portnumber), + _("Port Number"), + [Item(Id("0"), "0", true), Item(Id("1"), "1")] ), VSpacing(1), # TextEntry label @@ -165,12 +156,8 @@ def S390Dialog(builder:) ), HSpacing(6) ) - # S/390 dialog help: QETH Port name + # S/390 dialog help: QETH Options helptext = _( - "

    Enter the Port Name for this interface (case-sensitive).

    " - ) + - # S/390 dialog help: QETH Options - _( "

    Enter any additional Options for this interface (separated by spaces).

    " ) + _( @@ -352,7 +339,7 @@ def S390Dialog(builder:) id = case builder.type.short_name when "hsi" then :qeth_options - when "qeth" then :qeth_portname + when "qeth" then :qeth_options when "iucv" then :iucv_user else :chan_mode end @@ -414,8 +401,6 @@ def S390Dialog(builder:) LanItems.qeth_portnumber = Convert.to_string( UI.QueryWidget(Id(:qeth_portnumber), :Value) ) - LanItems.qeth_portname = Convert.to_string( - UI.QueryWidget(Id(:qeth_portname), :Value) ) end read = Convert.to_string(UI.QueryWidget(Id(:qeth_chan_read), :Value)) diff --git a/src/include/network/lan/s390.rb b/src/include/network/lan/s390.rb index c20edc579..2c90ebb1f 100644 --- a/src/include/network/lan/s390.rb +++ b/src/include/network/lan/s390.rb @@ -58,7 +58,6 @@ def s390_ReadQethAttribute(devname, attrib) # # Currently loaded attributes are: # QETH_LAYER2 yes/no string. - # QETH_PORTNAME portname or empty string # QETH_PORTNUMBER portnumber or empty string # QETH_CHANIDS read/write/control channel ids separated by space (compatibility requirement) # @@ -74,9 +73,6 @@ def s390_ReadQethConfig(devname) qeth_layer2 = s390_ReadQethAttribute(devname, "layer2") == "1" ? "yes" : "no" result = Builtins.add(result, "QETH_LAYER2", qeth_layer2) - qeth_portname = s390_ReadQethAttribute(devname, "portname") - result = Builtins.add(result, "QETH_PORTNAME", qeth_portname) - qeth_portno = s390_ReadQethAttribute(devname, "portno") result = Builtins.add(result, "QETH_PORTNUMBER", qeth_portno) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index bcba086ee..71076d406 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -98,7 +98,6 @@ def main @Requires = [] # s390 options - @qeth_portname = "" @qeth_portnumber = "" # * ctc as PROTOCOL (or ctc mode, number in { 0, 1, .., 4 }, default: 0) @chan_mode = "0" @@ -961,7 +960,6 @@ def createS390Device(dev_attrs = {}) @type = dev_attrs["type"] || "" @qeth_chanids = dev_attrs["chanids"] || "" @qeth_layer2 = dev_attrs.fetch("layer2", false) - @qeth_portname = dev_attrs["portname"] || "" @chan_mode = dev_attrs["protocol"] || "" @iucv_user = dev_attrs["router"] || "" end @@ -978,11 +976,6 @@ def createS390Device(dev_attrs = {}) else "" end - @portname_param = if Ops.greater_than(Builtins.size(@qeth_portname), 0) - Builtins.sformat("-p %1", @qeth_portname.shellescape) - else - "" - end @options_param = if Ops.greater_than(Builtins.size(@qeth_options), 0) Builtins.sformat("-o %1", @qeth_options.shellescape) else @@ -992,7 +985,6 @@ def createS390Device(dev_attrs = {}) "/sbin/qeth_configure %1 %2 %3 %4 %5 1", @options_param, @qeth_layer2 ? "-l" : "", - @portname_param, @portnumber_param, @qeth_chanids ) @@ -1386,7 +1378,6 @@ def yast_config # @attribute Requires publish_variable :Requires, "list " publish_variable :set_default_route, "boolean" - publish_variable :qeth_portname, "string" publish_variable :qeth_portnumber, "string" publish_variable :chan_mode, "string" publish_variable :qeth_options, "string" From 2cdbe49d5188df2ca9c8c5a028c0df8cc726b57c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 22 Aug 2019 14:40:04 +0100 Subject: [PATCH 436/471] Added s390 activation dialog and qeth builder. --- src/include/network/lan/hardware.rb | 369 +----------------- src/lib/y2network/connection_config/qeth.rb | 5 + .../dialogs/s390_device_activation.rb | 74 ++++ src/lib/y2network/interface_config_builder.rb | 2 +- .../interface_config_builders/qeth.rb | 68 ++++ src/lib/y2network/widgets/s390_channels.rb | 96 +++++ src/lib/y2network/widgets/s390_common.rb | 180 +++++++++ 7 files changed, 436 insertions(+), 358 deletions(-) create mode 100644 src/lib/y2network/dialogs/s390_device_activation.rb create mode 100644 src/lib/y2network/interface_config_builders/qeth.rb create mode 100644 src/lib/y2network/widgets/s390_channels.rb create mode 100644 src/lib/y2network/widgets/s390_common.rb diff --git a/src/include/network/lan/hardware.rb b/src/include/network/lan/hardware.rb index f797a04f4..cdff99d4e 100644 --- a/src/include/network/lan/hardware.rb +++ b/src/include/network/lan/hardware.rb @@ -29,6 +29,8 @@ include Yast::UIShortcuts +require "y2network/dialogs/s390_device_activation" + module Yast module NetworkLanHardwareInclude def initialize_network_lan_hardware(include_target) @@ -72,369 +74,22 @@ def initHelp # S/390 devices configuration dialog # @return dialog result def S390Dialog(builder:) - # S/390 dialog caption - caption = _("S/390 Network Card Configuration") - - drvtype = DriverType(builder.type.short_name) - - helptext = "" - contents = Empty() - - if Builtins.contains(["qeth", "hsi"], builder.type.short_name) - # CHANIDS - tmp_list = Builtins.splitstring(LanItems.qeth_chanids, " ") - chanids_map = { - "read" => Ops.get(tmp_list, 0, ""), - "write" => Ops.get(tmp_list, 1, ""), - "control" => Ops.get(tmp_list, 2, "") - } - contents = HBox( - HSpacing(6), - # Frame label - Frame( - _("S/390 Device Settings"), - HBox( - HSpacing(2), - VBox( - VSpacing(1), - ComboBox( - Id(:qeth_portnumber), - _("Port Number"), - [Item(Id("0"), "0", true), Item(Id("1"), "1")] - ), - VSpacing(1), - # TextEntry label - InputField( - Id(:qeth_options), - Opt(:hstretch), - Label.Options, - LanItems.qeth_options - ), - VSpacing(1), - # CheckBox label - Left(CheckBox(Id(:ipa_takeover), _("&Enable IPA Takeover"))), - VSpacing(1), - # CheckBox label - Left( - CheckBox( - Id(:qeth_layer2), - Opt(:notify), - _("Enable &Layer 2 Support") - ) - ), - # TextEntry label - InputField( - Id(:qeth_macaddress), - Opt(:hstretch), - _("Layer2 &MAC Address"), - LanItems.qeth_macaddress - ), - VSpacing(1), - HBox( - InputField( - Id(:qeth_chan_read), - Opt(:hstretch), - _("Read Channel"), - Ops.get_string(chanids_map, "read", "") - ), - InputField( - Id(:qeth_chan_write), - Opt(:hstretch), - _("Write Channel"), - Ops.get_string(chanids_map, "write", "") - ), - InputField( - Id(:qeth_chan_control), - Opt(:hstretch), - _("Control Channel"), - Ops.get_string(chanids_map, "control", "") - ) - ) - ), - HSpacing(2) + ret = Y2Network::Dialogs::S390DeviceActivation.run(builder) + if ret == :next + configured = builder.configure + builder.name = builder.configured_interface if configured + if !configured || builder.name.empty? + Popup.Error( + _( + "An error occurred while creating device.\nSee YaST log for details." ) - ), - HSpacing(6) - ) - # S/390 dialog help: QETH Options - helptext = _( - "

    Enter any additional Options for this interface (separated by spaces).

    " - ) + - _( - "

    Select Enable IPA Takeover if IP address takeover should be enabled for this interface.

    " - ) + - _( - "

    Select Enable Layer 2 Support if this card has been configured with layer 2 support.

    " - ) + - _( - "

    Enter the Layer 2 MAC Address if this card has been configured with layer 2 support.

    " ) - end - - if drvtype == "lcs" - tmp_list = Builtins.splitstring(LanItems.qeth_chanids, " ") - chanids_map = { - "read" => Ops.get(tmp_list, 0, ""), - "write" => Ops.get(tmp_list, 1, "") - } - contents = HBox( - HSpacing(6), - # Frame label - Frame( - _("S/390 Device Settings"), - HBox( - HSpacing(2), - VBox( - VSpacing(1), - # TextEntry label - InputField( - Id(:chan_mode), - Opt(:hstretch), - _("&Port Number"), - LanItems.chan_mode - ), - VSpacing(1), - # TextEntry label - InputField( - Id(:lcs_timeout), - Opt(:hstretch), - _("&LANCMD Time-Out"), - LanItems.lcs_timeout - ), - VSpacing(1), - HBox( - InputField( - Id(:qeth_chan_read), - Opt(:hstretch), - _("Read Channel"), - Ops.get_string(chanids_map, "read", "") - ), - InputField( - Id(:qeth_chan_write), - Opt(:hstretch), - _("Write Channel"), - Ops.get_string(chanids_map, "write", "") - ) - ) - ), - HSpacing(2) - ) - ), - HSpacing(6) - ) - # S/390 dialog help: LCS - helptext = _("

    Choose the Port Number for this interface.

    ") + - _("

    Specify the LANCMD Time-Out for this interface.

    ") - end - - ctcitems = [ - # ComboBox item: CTC device protocol - Item(Id("0"), _("Compatibility Mode")), - # ComboBox item: CTC device protocol - Item(Id("1"), _("Extended Mode")), - # ComboBox item: CTC device protocol - Item(Id("2"), _("CTC-Based tty (Linux to Linux Connections)")), - # ComboBox item: CTC device protocol - Item(Id("3"), _("Compatibility Mode with OS/390 and z/OS")) - ] - if drvtype == "ctc" - tmp_list = Builtins.splitstring(LanItems.qeth_chanids, " ") - chanids_map = { - "read" => Ops.get(tmp_list, 0, ""), - "write" => Ops.get(tmp_list, 1, "") - } - contents = HBox( - HSpacing(6), - # Frame label - Frame( - _("S/390 Device Settings"), - HBox( - HSpacing(2), - VBox( - VSpacing(1), - # TextEntry label - ComboBox(Id(:chan_mode), _("&Protocol"), ctcitems), - VSpacing(1), - HBox( - InputField( - Id(:qeth_chan_read), - Opt(:hstretch), - _("Read Channel"), - Ops.get_string(chanids_map, "read", "") - ), - InputField( - Id(:qeth_chan_write), - Opt(:hstretch), - _("Write Channel"), - Ops.get_string(chanids_map, "write", "") - ) - ) - ), - HSpacing(2) - ) - ), - HSpacing(6) - ) - # S/390 dialog help: CTC - helptext = _("

    Choose the Protocol for this interface.

    ") - end - - if drvtype == "iucv" - contents = HBox( - HSpacing(6), - # Frame label - Frame( - _("S/390 Device Settings"), - HBox( - HSpacing(2), - VBox( - VSpacing(1), - # TextEntry label, #42789 - InputField( - Id(:iucv_user), - Opt(:hstretch), - _("&Peer Name"), - LanItems.iucv_user - ), - VSpacing(1) - ), - HSpacing(2) - ) - ), - HSpacing(6) - ) - # S/390 dialog help: IUCV, #42789 - helptext = _( - "

    Enter the name of the IUCV peer,\nfor example, the z/VM user name with which to connect (case-sensitive).

    \n" - ) - end - - Wizard.SetContentsButtons( - caption, - contents, - helptext, - Label.BackButton, - Label.NextButton - ) - - if drvtype == "ctc" - UI.ChangeWidget(Id(:chan_mode), :Value, LanItems.chan_mode) - end - - if drvtype == "lcs" - UI.ChangeWidget(Id(:chan_mode), :Value, LanItems.chan_mode) - UI.ChangeWidget(Id(:lcs_timeout), :Value, LanItems.lcs_timeout) - end - - if drvtype == "qeth" - UI.ChangeWidget(Id(:ipa_takeover), :Value, LanItems.ipa_takeover) - UI.ChangeWidget(Id(:qeth_layer2), :Value, LanItems.qeth_layer2) - UI.ChangeWidget( - Id(:qeth_macaddress), - :ValidChars, - ":0123456789abcdefABCDEF" - ) - end - - id = case builder.type.short_name - when "hsi" then :qeth_options - when "qeth" then :qeth_options - when "iucv" then :iucv_user - else :chan_mode - end - UI.SetFocus(Id(id)) - - ret = nil - loop do - if drvtype == "qeth" - mac_enabled = Convert.to_boolean( - UI.QueryWidget(Id(:qeth_layer2), :Value) - ) - UI.ChangeWidget(Id(:qeth_macaddress), :Enabled, mac_enabled) - end - - ret = UI.UserInput - - case ret - when :abort, :cancel - ReallyAbort() ? break : next - when :back - break - when :next - if builder.type.short_name == "iucv" - LanItems.device = Ops.add( - "id-", - Convert.to_string(UI.QueryWidget(Id(:iucv_user), :Value)) - ) - LanItems.iucv_user = Convert.to_string( - UI.QueryWidget(Id(:iucv_user), :Value) - ) - end - - if builder.type.short_name == "ctc" - LanItems.chan_mode = Convert.to_string( - UI.QueryWidget(Id(:chan_mode), :Value) - ) - end - if builder.type.short_name == "lcs" - LanItems.lcs_timeout = Convert.to_string( - UI.QueryWidget(Id(:lcs_timeout), :Value) - ) - LanItems.chan_mode = Convert.to_string( - UI.QueryWidget(Id(:chan_mode), :Value) - ) - end - if builder.type.short_name == "qeth" || builder.type.short_name == "hsi" - LanItems.qeth_options = Convert.to_string( - UI.QueryWidget(Id(:qeth_options), :Value) - ) - LanItems.ipa_takeover = Convert.to_boolean( - UI.QueryWidget(Id(:ipa_takeover), :Value) - ) - LanItems.qeth_layer2 = Convert.to_boolean( - UI.QueryWidget(Id(:qeth_layer2), :Value) - ) - LanItems.qeth_macaddress = Convert.to_string( - UI.QueryWidget(Id(:qeth_macaddress), :Value) - ) - LanItems.qeth_portnumber = Convert.to_string( - UI.QueryWidget(Id(:qeth_portnumber), :Value) - ) - ) - end - read = Convert.to_string(UI.QueryWidget(Id(:qeth_chan_read), :Value)) - write = Convert.to_string( - UI.QueryWidget(Id(:qeth_chan_write), :Value) - ) - control = Convert.to_string( - UI.QueryWidget(Id(:qeth_chan_control), :Value) - ) - control = "" if control.nil? - LanItems.qeth_chanids = String.CutBlanks( - Builtins.sformat("%1 %2 %3", read, write, control) - ) - if LanItems.createS390Device - builder.name = LanItems.GetCurrentName - else - Popup.Error( - _( - "An error occurred while creating device.\nSee YaST log for details." - ) - ) - ret = nil - next - end - break - when :qeth_layer2 - next - else - Builtins.y2error("Unexpected return code: %1", ret) - next + ret = nil end end - deep_copy(ret) + ret end end end diff --git a/src/lib/y2network/connection_config/qeth.rb b/src/lib/y2network/connection_config/qeth.rb index c8004482a..c4b698f24 100644 --- a/src/lib/y2network/connection_config/qeth.rb +++ b/src/lib/y2network/connection_config/qeth.rb @@ -47,14 +47,19 @@ class Qeth < Base attr_accessor :data_channel # @return [Boolean] whether layer2 is enabled or not attr_accessor :layer2 + # @return [Boolean] whether ipa takeover is enabled or not + attr_accessor :ipa_takeover # @return [Integer] port number (0 or 1) attr_accessor :port_number + # @return [String] configuration extra attributes + attr_accessor :attributes # Constructor def initialize super() @layer2 = false @port_number = 0 + @ipa_takeover = false end def ==(other) diff --git a/src/lib/y2network/dialogs/s390_device_activation.rb b/src/lib/y2network/dialogs/s390_device_activation.rb new file mode 100644 index 000000000..6764cffdc --- /dev/null +++ b/src/lib/y2network/dialogs/s390_device_activation.rb @@ -0,0 +1,74 @@ +require "cwm/dialog" +require "y2network/widgets/s390_common" +require "y2network/widgets/s390_channels" + +module Y2Network + module Dialogs + class S390DeviceActivation < CWM::Dialog + def initialize(settings) + textdomain "network" + + @settings = settings + @settings.proposal + end + + def title + _("S/390 Network Card Configuration") + end + + def contents + HBox( + HSpacing(6), + Frame( + _("S/390 Device Settings"), + HBox( + HSpacing(2), + VBox( + VSpacing(1), + HBox( + s390_port_number, + HSpacing(1), + s390_options + ), + VSpacing(1), + Left(s390_ip_takeover), + VSpacing(1), + Left(s390_layer2), + VSpacing(1), + s390_channels + ), + HSpacing(2) + ) + ), + HSpacing(6) + ) + end + + def abort_handler + Yast::Popup.YesNo("Really abort?") + end + + private + + def s390_port_number + Y2Network::Widgets::S390PortNumber.new(@settings) + end + + def s390_options + Y2Network::Widgets::S390QethOptions.new(@settings) + end + + def s390_ip_takeover + Y2Network::Widgets::S390IPAddressTakeover.new(@settings) + end + + def s390_channels + Y2Network::Widgets::S390Channels.new(@settings) + end + + def s390_layer2 + Y2Network::Widgets::S390Layer2.new(@settings) + end + end + end +end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index d907a8aac..2d55b55da 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -395,7 +395,7 @@ def ip_config_default def connection_config_klass(type) ConnectionConfig.const_get(type.class_name) rescue NameError - log.error "Could not find a class to handle '#{type.name}' connections" + log.error "Could not find a class to handle '#{type.class_name}' connections" ConnectionConfig::Base end diff --git a/src/lib/y2network/interface_config_builders/qeth.rb b/src/lib/y2network/interface_config_builders/qeth.rb new file mode 100644 index 000000000..72c614de9 --- /dev/null +++ b/src/lib/y2network/interface_config_builders/qeth.rb @@ -0,0 +1,68 @@ +require "yast" +require "y2network/interface_config_builder" + +Yast.import "LanItems" +Yast.import "NetworkInterfaces" + +module Y2Network + module InterfaceConfigBuilders + class Qeth < InterfaceConfigBuilder + extend Forwardable + + def initialize(config: nil) + super(type: InterfaceType::QETH, config: config) + end + + def_delegators :@connection_config, + :read_channel, :read_channel=, + :write_channel, :write_channel=, + :data_channel, :data_channel=, + :layer2, :layer2=, + :port_number, :port_number=, + :lladdress, :lladdress=, + :ipa_takeover, :ipa_takeover=, + :attributes, :attributes= + + # @return [String] + def configure_attributes + @connection_config.attributes.split(" ") + end + + def device_id + return if read_channel.to_s.empty? + + [read_channel, write_channel, data_channel].join(":") + end + + def device_id_from(busid) + cmd = "/sbin/lszdev qeth -c id -n".split(" ") + + Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| + d.include? busid + end + end + + def configure + cmd = "/sbin/chzdev -e qeth #{device_id}".split(" ").concat(configure_attributes) + + Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? + end + + def configured_interface + cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ").concat(configure_attributes) + + Yast::Execute.stdout.on_target!(cmd).chomp + end + + def propose_channels + id = device_id_from(hwinfo.busid) + return unless id + self.read_channel, self.write_channel, self.data_channel = id.split(":") + end + + def proposal + propose_channels unless device_id + end + end + end +end diff --git a/src/lib/y2network/widgets/s390_channels.rb b/src/lib/y2network/widgets/s390_channels.rb new file mode 100644 index 000000000..9de983bdc --- /dev/null +++ b/src/lib/y2network/widgets/s390_channels.rb @@ -0,0 +1,96 @@ +require "cwm/custom_widget" +require "cwm/common_widgets" + +module Y2Network + module Widgets + class S390Channels < CWM::CustomWidget + def initialize(settings) + textdomain "network" + @settings = settings + end + + def label + "" + end + + def contents + HBox( + S390ReadChannel.new(@settings), + HSpacing(1), + S390WriteChannel.new(@settings), + HSpacing(1), + S390DataChannel.new(@settings) + ) + end + end + + class S390ReadChannel < CWM::InputField + def initialize(settings) + textdomain "network" + @settings = settings + end + + def init + self.value = @settings.read_channel + end + + def opt + [:hstretch] + end + + def label + _("&Read Channel") + end + + def store + @settings.read_channel = value + end + end + + class S390WriteChannel < CWM::InputField + def initialize(settings) + textdomain "network" + @settings = settings + end + + def init + self.value = @settings.write_channel + end + + def opt + [:hstretch] + end + + def label + _("&Read Channel") + end + + def store + @settings.write_channel = value + end + end + + class S390DataChannel < CWM::InputField + def initialize(settings) + textdomain "network" + @settings = settings + end + + def init + self.value = @settings.data_channel + end + + def opt + [:hstretch] + end + + def label + _("Control Channel") + end + + def store + @settings.data_channel = value + end + end + end +end diff --git a/src/lib/y2network/widgets/s390_common.rb b/src/lib/y2network/widgets/s390_common.rb new file mode 100644 index 000000000..047ffb464 --- /dev/null +++ b/src/lib/y2network/widgets/s390_common.rb @@ -0,0 +1,180 @@ +require "cwm/common_widgets" +require "cwm/custom_widget" + +module Y2Network + module Widgets + class S390PortNumber < CWM::ComboBox + def initialize(settings) + textdomain "network" + + @settings = settings + end + + def init + self.value = @settings.port_number.to_i + end + + def label + _("Port Number") + end + + def items + [[0, "0"], [1, "1"]] + end + + def store + @settings.port_number = value + end + end + + class S390QethOptions < CWM::InputField + def initialize(settings) + textdomain "network" + @settings = settings + end + + def label + _("Options") + end + + def init + self.value = @settings.attributes + end + + def opt + [:hstretch] + end + + def help + # TRANSLATORS: S/390 dialog help for QETH Options + _("

    Enter any additional Options for this interface (separated by spaces).

    ") + end + + def store + @settings.attributes = value + end + end + + class S390IPAddressTakeover < CWM::CheckBox + def initialize(settings) + textdomain "network" + @settings = settings + end + + def init + self.value = !!@settings.ipa_takeover + end + + def label + _("Enable IPA takeover") + end + + def help + _("

    Select Enable IPA Takeover if IP address takeover should be enabled " \ + "for this interface.

    ") + end + + def store + @settings.ipa_takeover = value + end + end + + class S390Layer2 < CWM::CustomWidget + def initialize(settings) + textdomain "network" + @settings = settings + self.handle_all_events = true + end + + def contents + VBox( + Left(support_widget), + Left(mac_address_widget) + ) + end + + def init + refresh + end + + def handle(event) + case event["ID"] + when support_widget.widget_id, mac_address_widget.widget_id + refresh + end + + nil + end + + private + + def refresh + support_widget.checked? ? mac_address_widget.enable : mac_address_widget.disable + end + + def support_widget + @support_widget ||= S390Layer2Support.new(@settings) + end + + def mac_address_widget + @mac_address_widget ||= S390Layer2Address.new(@settings) + end + end + + class S390Layer2Support < CWM::CheckBox + def initialize(settings) + textdomain "network" + @settings = settings + end + + def init + self.value = !!@settings.layer2 + end + + def opt + [:notify] + end + + def label + _("Enable Layer2 Support") + end + + def help + "

    Select Enable Layer 2 Support if this card has been " \ + "configured with layer 2 support.

    " + end + + def store + @settings.layer2 = value + end + end + + class S390Layer2Address < CWM::InputField + def initialize(settings) + textdomain "network" + @settings = settings + end + + def init + self.value = @settings.lladdress + end + + def opt + [:notify] + end + + def label + _("Layer2 MAC Address") + end + + def help + _("

    Enter the Layer 2 MAC Address if this card has been " \ + "configured with layer 2 support.

    ") + end + + def store + @settings.lladdress = value + end + end + end +end From ad4218e69853f5a16e0a499dd44599514af99bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 23 Aug 2019 17:22:00 +0100 Subject: [PATCH 437/471] Added ctc and lcs activation dialogs. --- Rakefile | 19 +++ src/include/network/lan/hardware.rb | 7 +- src/lib/y2network/dialogs/s390.rb | 2 + .../y2network/dialogs/s390_ctc_activation.rb | 69 ++++++++ .../dialogs/s390_device_activation.rb | 89 +++++------ .../y2network/dialogs/s390_lcs_activation.rb | 73 +++++++++ .../y2network/dialogs/s390_qeth_activation.rb | 79 +++++++++ .../interface_config_builders/ctc.rb | 77 +++++++++ .../interface_config_builders/lcs.rb | 82 ++++++++++ .../interface_config_builders/qeth.rb | 52 +++++- src/lib/y2network/sysconfig/config_writer.rb | 1 + src/lib/y2network/widgets/s390_channels.rb | 52 +++++- src/lib/y2network/widgets/s390_common.rb | 150 +++++++++++++++++- .../dialogs/s390_ctc_activation_test.rb | 30 ++++ .../dialogs/s390_device_activation_test.rb | 38 +++++ .../dialogs/s390_lcs_activation_test.rb | 30 ++++ .../dialogs/s390_qeth_activation_test.rb | 30 ++++ .../interface_config_builders/ctc_test.rb | 144 +++++++++++++++++ .../interface_config_builders/lcs_test.rb | 146 +++++++++++++++++ .../interface_config_builders/qeth_test.rb | 144 +++++++++++++++++ test/y2network/widgets/s390_channels_test.rb | 111 +++++++++++++ test/y2network/widgets/s390_common_test.rb | 51 ++++++ 22 files changed, 1416 insertions(+), 60 deletions(-) create mode 100644 src/lib/y2network/dialogs/s390.rb create mode 100644 src/lib/y2network/dialogs/s390_ctc_activation.rb create mode 100644 src/lib/y2network/dialogs/s390_lcs_activation.rb create mode 100644 src/lib/y2network/dialogs/s390_qeth_activation.rb create mode 100644 src/lib/y2network/interface_config_builders/ctc.rb create mode 100644 src/lib/y2network/interface_config_builders/lcs.rb create mode 100644 test/y2network/dialogs/s390_ctc_activation_test.rb create mode 100644 test/y2network/dialogs/s390_device_activation_test.rb create mode 100644 test/y2network/dialogs/s390_lcs_activation_test.rb create mode 100644 test/y2network/dialogs/s390_qeth_activation_test.rb create mode 100644 test/y2network/interface_config_builders/ctc_test.rb create mode 100644 test/y2network/interface_config_builders/lcs_test.rb create mode 100644 test/y2network/interface_config_builders/qeth_test.rb create mode 100644 test/y2network/widgets/s390_channels_test.rb create mode 100644 test/y2network/widgets/s390_common_test.rb diff --git a/Rakefile b/Rakefile index 7eebc5df4..230638706 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast/rake" Yast::Tasks.configuration do |conf| diff --git a/src/include/network/lan/hardware.rb b/src/include/network/lan/hardware.rb index cdff99d4e..0d9abb8cd 100644 --- a/src/include/network/lan/hardware.rb +++ b/src/include/network/lan/hardware.rb @@ -29,7 +29,7 @@ include Yast::UIShortcuts -require "y2network/dialogs/s390_device_activation" +require "y2network/dialogs/s390" module Yast module NetworkLanHardwareInclude @@ -74,10 +74,13 @@ def initHelp # S/390 devices configuration dialog # @return dialog result def S390Dialog(builder:) - ret = Y2Network::Dialogs::S390DeviceActivation.run(builder) + dialog = Y2Network::Dialogs::S390DeviceActivation.for(builder.type) + ret = dialog ? dialog.run(builder) : :abort + if ret == :next configured = builder.configure builder.name = builder.configured_interface if configured + builder.interface.name = builder.name if configured && builder.interface if !configured || builder.name.empty? Popup.Error( _( diff --git a/src/lib/y2network/dialogs/s390.rb b/src/lib/y2network/dialogs/s390.rb new file mode 100644 index 000000000..56d54fdba --- /dev/null +++ b/src/lib/y2network/dialogs/s390.rb @@ -0,0 +1,2 @@ +require "y2network/dialogs/s390_qeth_activation" +require "y2network/dialogs/s390_ctc_activation" diff --git a/src/lib/y2network/dialogs/s390_ctc_activation.rb b/src/lib/y2network/dialogs/s390_ctc_activation.rb new file mode 100644 index 000000000..b43da40e8 --- /dev/null +++ b/src/lib/y2network/dialogs/s390_ctc_activation.rb @@ -0,0 +1,69 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/dialogs/s390_device_activation" + +module Y2Network + module Dialogs + # Dialog for activating a CTC device + class S390CtcActivation < S390DeviceActivation + def contents + textdomain "network" + + HBox( + HSpacing(6), + # Frame label + Frame( + _("S/390 Device Settings"), + HBox( + HSpacing(2), + VBox( + VSpacing(1), + # TextEntry label + protocol_widget, + VSpacing(1), + HBox( + read_channel_widget, + HSpacing(1), + write_channel_widget + ) + ), + HSpacing(2) + ) + ), + HSpacing(6) + ) + end + + private + + def protocol_widget + Y2Network::Widgets::S390Protocol.new(@settings) + end + + def read_channel_widget + Y2Network::Widgets::S390ReadChannel.new(@settings) + end + + def write_channel_widget + Y2Network::Widgets::S390WriteChannel.new(@settings) + end + end + end +end diff --git a/src/lib/y2network/dialogs/s390_device_activation.rb b/src/lib/y2network/dialogs/s390_device_activation.rb index 6764cffdc..0d9b421aa 100644 --- a/src/lib/y2network/dialogs/s390_device_activation.rb +++ b/src/lib/y2network/dialogs/s390_device_activation.rb @@ -1,10 +1,49 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/dialog" require "y2network/widgets/s390_common" require "y2network/widgets/s390_channels" module Y2Network module Dialogs + # Base class dialog for activating S390 devices class S390DeviceActivation < CWM::Dialog + # @param type [Y2Network::InterfaceType] type of device + # @return [S390DeviceActivation, nil] + def self.for(type) + case type.short_name + when "qeth", "hsi" + require "y2network/dialogs/s390_qeth_activation" + Y2Network::Dialogs::S390QethActivation + when "ctc" + require "y2network/dialogs/s390_ctc_activation" + Y2Network::Dialogs::S390CtcActivation + when "lcs" + require "y2network/dialogs/s390_lcs_activation" + Y2Network::Dialogs::S390LcsActivation + end + end + + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @@ -17,57 +56,11 @@ def title end def contents - HBox( - HSpacing(6), - Frame( - _("S/390 Device Settings"), - HBox( - HSpacing(2), - VBox( - VSpacing(1), - HBox( - s390_port_number, - HSpacing(1), - s390_options - ), - VSpacing(1), - Left(s390_ip_takeover), - VSpacing(1), - Left(s390_layer2), - VSpacing(1), - s390_channels - ), - HSpacing(2) - ) - ), - HSpacing(6) - ) + Empty() end def abort_handler - Yast::Popup.YesNo("Really abort?") - end - - private - - def s390_port_number - Y2Network::Widgets::S390PortNumber.new(@settings) - end - - def s390_options - Y2Network::Widgets::S390QethOptions.new(@settings) - end - - def s390_ip_takeover - Y2Network::Widgets::S390IPAddressTakeover.new(@settings) - end - - def s390_channels - Y2Network::Widgets::S390Channels.new(@settings) - end - - def s390_layer2 - Y2Network::Widgets::S390Layer2.new(@settings) + Yast::Popup.ReallyAbort(true) end end end diff --git a/src/lib/y2network/dialogs/s390_lcs_activation.rb b/src/lib/y2network/dialogs/s390_lcs_activation.rb new file mode 100644 index 000000000..7d3190d9b --- /dev/null +++ b/src/lib/y2network/dialogs/s390_lcs_activation.rb @@ -0,0 +1,73 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/dialogs/s390_device_activation" + +module Y2Network + module Dialogs + # Dialog for activating a LCS s390 device + class S390LcsActivation < S390DeviceActivation + def contents + textdomain "network" + + HBox( + HSpacing(6), + # Frame label + Frame( + _("S/390 Device Settings"), + HBox( + HSpacing(2), + VBox( + VSpacing(1), + # TextEntry label + protocol_widget, + VSpacing(1), + HBox( + read_channel_widget, + HSpacing(1), + write_channel_widget + ) + ), + HSpacing(2) + ) + ), + HSpacing(6) + ) + end + + private + + def protocol_widget + Y2Network::Widgets::S390Protocol.new(@settings) + end + + def read_channel_widget + Y2Network::Widgets::S390ReadChannel.new(@settings) + end + + def write_channel_widget + Y2Network::Widgets::S390WriteChannel.new(@settings) + end + + def timeout_widget + Y2network::Widgets::S390LanCmdTimeout.new(@settings) + end + end + end +end diff --git a/src/lib/y2network/dialogs/s390_qeth_activation.rb b/src/lib/y2network/dialogs/s390_qeth_activation.rb new file mode 100644 index 000000000..11b620df7 --- /dev/null +++ b/src/lib/y2network/dialogs/s390_qeth_activation.rb @@ -0,0 +1,79 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/dialogs/s390_device_activation" + +module Y2Network + module Dialogs + # Dialog for activating a QETH device + class S390QethActivation < S390DeviceActivation + def contents + textdomain "network" + + HBox( + HSpacing(6), + Frame( + _("S/390 Device Settings"), + HBox( + HSpacing(2), + VBox( + VSpacing(1), + HBox( + s390_port_number, + HSpacing(1), + s390_attributes + ), + VSpacing(1), + Left(s390_ip_takeover), + VSpacing(1), + Left(s390_layer2), + VSpacing(1), + s390_channels + ), + HSpacing(2) + ) + ), + HSpacing(6) + ) + end + + private + + def s390_port_number + Y2Network::Widgets::S390PortNumber.new(@settings) + end + + def s390_attributes + Y2Network::Widgets::S390Attributes.new(@settings) + end + + def s390_ip_takeover + Y2Network::Widgets::S390IPAddressTakeover.new(@settings) + end + + def s390_channels + Y2Network::Widgets::S390Channels.new(@settings) + end + + def s390_layer2 + Y2Network::Widgets::S390Layer2.new(@settings) + end + end + end +end diff --git a/src/lib/y2network/interface_config_builders/ctc.rb b/src/lib/y2network/interface_config_builders/ctc.rb new file mode 100644 index 000000000..9028a58e8 --- /dev/null +++ b/src/lib/y2network/interface_config_builders/ctc.rb @@ -0,0 +1,77 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/interface_config_builder" + +Yast.import "LanItems" +Yast.import "NetworkInterfaces" + +module Y2Network + module InterfaceConfigBuilders + class Ctc < InterfaceConfigBuilder + extend Forwardable + + def initialize(config: nil) + super(type: InterfaceType::CTC, config: config) + end + + def_delegators :@connection_config, + :read_channel, :read_channel=, + :write_channel, :write_channel=, + :protocol, :protocol= + + def device_id + return if read_channel.to_s.empty? + + "#{read_channel}:#{write_channel}" + end + + def device_id_from(channel) + cmd = "/sbin/lszdev ctc -c id -n".split(" ") + + Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| + d.include? channel + end + end + + def configure + cmd = "/sbin/chzdev ctc #{device_id} -e protocol=#{protocol}".split(" ") + + Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? + end + + def configured_interface + cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ") + + Yast::Execute.stdout.on_target!(cmd).chomp + end + + def propose_channels + id = device_id_from(hwinfo.busid) + return unless id + self.read_channel, self.write_channel = id.split(":") + end + + def proposal + propose_channels unless device_id + end + end + end +end diff --git a/src/lib/y2network/interface_config_builders/lcs.rb b/src/lib/y2network/interface_config_builders/lcs.rb new file mode 100644 index 000000000..49817acee --- /dev/null +++ b/src/lib/y2network/interface_config_builders/lcs.rb @@ -0,0 +1,82 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "y2network/interface_config_builder" + +Yast.import "LanItems" +Yast.import "NetworkInterfaces" + +module Y2Network + module InterfaceConfigBuilders + class Lcs < InterfaceConfigBuilder + extend Forwardable + + def initialize(config: nil) + super(type: InterfaceType::LCS, config: config) + end + + def_delegators :@connection_config, + :read_channel, :read_channel=, + :write_channel, :write_channel=, + :protocol, :protocol=, + :timeout, :timeout= + + def device_id + return if read_channel.to_s.empty? + + "#{read_channel}:#{write_channel}" + end + + def device_id_from(busid) + cmd = "/sbin/lszdev lcs -c id -n".split(" ") + + Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| + d.include? busid + end + end + + def configure_attributes + "protocol=#{protocol} lancmd_timeout=#{timeout.to_i}".split(" ") + end + + def configure + cmd = "/sbin/chzdev lcs #{device_id} -e ".split(" ").concat(configure_attributes) + + Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? + end + + def configured_interface + cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ") + + Yast::Execute.stdout.on_target!(cmd).chomp + end + + def propose_channels + id = device_id_from(hwinfo.busid) + return unless id + self.read_channel, self.write_channel = id.split(":") + end + + def proposal + propose_channels unless device_id + end + end + end +end diff --git a/src/lib/y2network/interface_config_builders/qeth.rb b/src/lib/y2network/interface_config_builders/qeth.rb index 72c614de9..568daf7fb 100644 --- a/src/lib/y2network/interface_config_builders/qeth.rb +++ b/src/lib/y2network/interface_config_builders/qeth.rb @@ -1,3 +1,22 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "yast" require "y2network/interface_config_builder" @@ -6,9 +25,15 @@ module Y2Network module InterfaceConfigBuilders + # Builder for S390 qeth interfaces. It also assumes the activation + # responsibilities. class Qeth < InterfaceConfigBuilder extend Forwardable + # Constructor + # + # @param config [Y2Network::ConnectionConfig::Base, nil] existing configuration of device or nil + # for newly created def initialize(config: nil) super(type: InterfaceType::QETH, config: config) end @@ -23,43 +48,60 @@ def initialize(config: nil) :ipa_takeover, :ipa_takeover=, :attributes, :attributes= - # @return [String] + # @return [Array] def configure_attributes - @connection_config.attributes.split(" ") + return [] unless attributes + + attributes.split(" ") end + # The device id to be used by lszdev or chzdev commands + # + # @return [String] def device_id return if read_channel.to_s.empty? [read_channel, write_channel, data_channel].join(":") end - def device_id_from(busid) + # Returns the complete device id which contains the given channel + # + # @param channel [String] + # @return [String] + def device_id_from(channel) cmd = "/sbin/lszdev qeth -c id -n".split(" ") Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| - d.include? busid + d.include? channel end end + # It tries to enable the interface with the configured device id + # + # @return [Boolean] true when enabled def configure - cmd = "/sbin/chzdev -e qeth #{device_id}".split(" ").concat(configure_attributes) + cmd = "/sbin/chzdev qeth #{device_id} -e".split(" ").concat(configure_attributes) Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? end + # Obtains the enabled interface name associated with the device id + # + # @return [String] device name def configured_interface cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ").concat(configure_attributes) Yast::Execute.stdout.on_target!(cmd).chomp end + # Modifies the read, write and data channel from the the device id def propose_channels id = device_id_from(hwinfo.busid) return unless id self.read_channel, self.write_channel, self.data_channel = id.split(":") end + # Makes a new channels proposal only if not already set def proposal propose_channels unless device_id end diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 453e89cf5..fc28530c7 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -67,6 +67,7 @@ def write(config, old_config = nil) def write_interface_changes(config, old_config) # Write ifroute files config.interfaces.each do |dev| + next if dev.name.empty? routes = find_routes_for(dev, config.routing.routes) file = routes_file_for(dev) diff --git a/src/lib/y2network/widgets/s390_channels.rb b/src/lib/y2network/widgets/s390_channels.rb index 9de983bdc..9993769e5 100644 --- a/src/lib/y2network/widgets/s390_channels.rb +++ b/src/lib/y2network/widgets/s390_channels.rb @@ -1,18 +1,44 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/custom_widget" require "cwm/common_widgets" module Y2Network module Widgets + # A container widget for setting the QETH and HSI device channels (read, + # write and control) class S390Channels < CWM::CustomWidget + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def label "" end + # @see CWM::AbstractWidget def contents HBox( S390ReadChannel.new(@settings), @@ -24,70 +50,94 @@ def contents end end + # Widget for setting the s390 device read channel class S390ReadChannel < CWM::InputField + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def init self.value = @settings.read_channel end + # @see CWM::AbstractWidget def opt [:hstretch] end + # @see CWM::AbstractWidget def label _("&Read Channel") end + # @see CWM::AbstractWidget def store @settings.read_channel = value end end + # Widget for setting the s390 device write channel class S390WriteChannel < CWM::InputField + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def init self.value = @settings.write_channel end + # @see CWM::AbstractWidget def opt [:hstretch] end + # @see CWM::AbstractWidget def label - _("&Read Channel") + _("&Write Channel") end + # @see CWM::AbstractWidget def store @settings.write_channel = value end end + # Widget for setting the s390 device data channel class S390DataChannel < CWM::InputField + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def init self.value = @settings.data_channel end + # @see CWM::AbstractWidget def opt [:hstretch] end + # @see CWM::AbstractWidget def label _("Control Channel") end + # @see CWM::AbstractWidget def store @settings.data_channel = value end diff --git a/src/lib/y2network/widgets/s390_common.rb b/src/lib/y2network/widgets/s390_common.rb index 047ffb464..0dff57bc5 100644 --- a/src/lib/y2network/widgets/s390_common.rb +++ b/src/lib/y2network/widgets/s390_common.rb @@ -1,85 +1,211 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + require "cwm/common_widgets" require "cwm/custom_widget" module Y2Network module Widgets + # Widget for setting the s390 device write channel + class S390LanCmdTimeout < CWM::InputField + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] + def initialize(settings) + textdomain "network" + + @settings = settings + end + + # @see CWM::AbstractWidget + def label + _("&LANCMD Time-Out") + end + + # @see CWM::AbstractWidget + def init + self.value = @settings.timeout + end + + # @see CWM::AbstractWidget + def store + @settings.timeout = value + end + + # @see CWM::AbstractWidget + def help + _("

    Specify the LANCMD Time-Out for this interface.

    ") + end + end + + class S390Protocol < CWM::ComboBox + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] + def initialize(settings) + textdomain "network" + + @settings = settings + end + + # @see CWM::AbstractWidget + def init + self.value = @settings.protocol + end + + # @see CWM::AbstractWidget + def label + _("&Protocol") + end + + # @see CWM::AbstractWidget + def items + [ + # ComboBox item: CTC device protocol + ["0", _("Compatibility Mode")], + # ComboBox item: CTC device protocol + ["1", _("Extended Mode")], + # ComboBox item: CTC device protocol + ["2", _("CTC-Based tty (Linux to Linux Connections)")], + # ComboBox item: CTC device protocol + ["3", _("Compatibility Mode with OS/390 and z/OS")] + ] + end + + # @see CWM::AbstractWidget + def store + @settings.protocol = value + end + + # @see CWM::AbstractWidget + def help + _("

    Choose the Protocol for this interface.

    ") + end + end + class S390PortNumber < CWM::ComboBox + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def init - self.value = @settings.port_number.to_i + self.value = @settings.port_number.to_s end + # @see CWM::AbstractWidget def label _("Port Number") end + # @see CWM::AbstractWidget def items - [[0, "0"], [1, "1"]] + [["0", "0"], ["1", "1"]] end + # @see CWM::AbstractWidget def store - @settings.port_number = value + @settings.port_number = value.to_i + end + + # @see CWM::AbstractWidget + def help + _("

    Choose the Port Number for this interface.

    ") end end - class S390QethOptions < CWM::InputField + class S390Attributes < CWM::InputField + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def label _("Options") end + # @see CWM::AbstractWidget def init self.value = @settings.attributes end + # @see CWM::AbstractWidget def opt [:hstretch] end + # @see CWM::AbstractWidget def help # TRANSLATORS: S/390 dialog help for QETH Options _("

    Enter any additional Options for this interface (separated by spaces).

    ") end + # @see CWM::AbstractWidget def store @settings.attributes = value end end class S390IPAddressTakeover < CWM::CheckBox + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def init self.value = !!@settings.ipa_takeover end + # @see CWM::AbstractWidget def label _("Enable IPA takeover") end + # @see CWM::AbstractWidget def help _("

    Select Enable IPA Takeover if IP address takeover should be enabled " \ "for this interface.

    ") end + # @see CWM::AbstractWidget def store @settings.ipa_takeover = value end end class S390Layer2 < CWM::CustomWidget + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings @@ -122,56 +248,72 @@ def mac_address_widget end class S390Layer2Support < CWM::CheckBox + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def init self.value = !!@settings.layer2 end + # @see CWM::AbstractWidget def opt [:notify] end + # @see CWM::AbstractWidget def label _("Enable Layer2 Support") end + # @see CWM::AbstractWidget def help "

    Select Enable Layer 2 Support if this card has been " \ "configured with layer 2 support.

    " end + # @see CWM::AbstractWidget def store @settings.layer2 = value end end class S390Layer2Address < CWM::InputField + # Constructor + # + # @param settings [Y2Network::InterfaceConfigBuilder] def initialize(settings) textdomain "network" @settings = settings end + # @see CWM::AbstractWidget def init self.value = @settings.lladdress end + # @see CWM::AbstractWidget def opt [:notify] end + # @see CWM::AbstractWidget def label _("Layer2 MAC Address") end + # @see CWM::AbstractWidget def help _("

    Enter the Layer 2 MAC Address if this card has been " \ "configured with layer 2 support.

    ") end + # @see CWM::AbstractWidget def store @settings.lladdress = value end diff --git a/test/y2network/dialogs/s390_ctc_activation_test.rb b/test/y2network/dialogs/s390_ctc_activation_test.rb new file mode 100644 index 000000000..c5eba4cda --- /dev/null +++ b/test/y2network/dialogs/s390_ctc_activation_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/dialogs/s390_ctc_activation" +require "y2network/interface_config_builder" + +describe Y2Network::Dialogs::S390CtcActivation do + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("ctc")) } + + include_examples "CWM::Dialog" +end diff --git a/test/y2network/dialogs/s390_device_activation_test.rb b/test/y2network/dialogs/s390_device_activation_test.rb new file mode 100644 index 000000000..7b6e3c1e6 --- /dev/null +++ b/test/y2network/dialogs/s390_device_activation_test.rb @@ -0,0 +1,38 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/dialogs/s390_device_activation" +require "y2network/interface_config_builder" + +describe Y2Network::Dialogs::S390DeviceActivation do + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("qeth")) } + + include_examples "CWM::Dialog" + + describe "#abort_handler" do + it "asks for abort confirmation" do + expect(Yast::Popup).to receive(:ReallyAbort).with(true) + + subject.abort_handler + end + end +end diff --git a/test/y2network/dialogs/s390_lcs_activation_test.rb b/test/y2network/dialogs/s390_lcs_activation_test.rb new file mode 100644 index 000000000..7d2d1fbe0 --- /dev/null +++ b/test/y2network/dialogs/s390_lcs_activation_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/dialogs/s390_lcs_activation" +require "y2network/interface_config_builder" + +describe Y2Network::Dialogs::S390LcsActivation do + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("lcs")) } + + include_examples "CWM::Dialog" +end diff --git a/test/y2network/dialogs/s390_qeth_activation_test.rb b/test/y2network/dialogs/s390_qeth_activation_test.rb new file mode 100644 index 000000000..7fa970f61 --- /dev/null +++ b/test/y2network/dialogs/s390_qeth_activation_test.rb @@ -0,0 +1,30 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "cwm/rspec" + +require "y2network/dialogs/s390_qeth_activation" +require "y2network/interface_config_builder" + +describe Y2Network::Dialogs::S390QethActivation do + subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("qeth")) } + + include_examples "CWM::Dialog" +end diff --git a/test/y2network/interface_config_builders/ctc_test.rb b/test/y2network/interface_config_builders/ctc_test.rb new file mode 100644 index 000000000..80326cb54 --- /dev/null +++ b/test/y2network/interface_config_builders/ctc_test.rb @@ -0,0 +1,144 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "yast" +require "y2network/interface_config_builders/ctc" +require "y2network/interface_type" + +describe Y2Network::InterfaceConfigBuilders::Ctc do + subject(:builder) do + res = Y2Network::InterfaceConfigBuilders::Ctc.new + res.name = "ctc0" + res + end + + let(:executor) { double("Yast::Execute", on_target!: "") } + let(:initialize_channels) { true } + + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + builder.read_channel = "0.0.0900" if initialize_channels + builder.write_channel = "0.0.0901" if initialize_channels + end + + describe "#type" do + it "returns ctc type" do + expect(subject.type).to eq Y2Network::InterfaceType::CTC + end + end + + describe "#configure" do + it "tries to activate the group device associated with the defined device id" do + expect(Yast::Execute).to receive(:on_target!) + .with("/sbin/chzdev", "ctc", builder.device_id, "-e", + "protocol=#{builder.protocol}", allowed_exitstatus: 0..255) + .and_return(0) + subject.configure + end + + context "when activated succesfully" do + it "returns true" do + expect(Yast::Execute).to receive(:on_target!).and_return(0) + expect(subject.configure).to eq(true) + end + end + + context "when failed the activation and returned a non zero return code" do + it "returns false" do + expect(Yast::Execute).to receive(:on_target!).and_return(34) + expect(subject.configure).to eq(false) + end + end + end + + describe "#configured_interface" do + before do + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", builder.device_id, "-c", "names", "-n"]) + .and_return("ctc1") + end + + it "obtains the network interface associated with builder device id" do + expect(subject.configured_interface).to eq("ctc1") + end + end + + describe "#device_id_from" do + context "given the read or write device id" do + let(:device_id) { "0.0.0800:0.0.0801" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + before do + allow(builder).to receive(:hwinfo).and_return(hwinfo) + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", "ctc", "-c", "id", "-n"]) + .and_return(device_id) + end + + it "obtains the triplet device ids listed by lszdev" do + expect(subject.device_id_from(hwinfo.busid)).to eq(device_id) + end + end + end + + describe "#device_id" do + it "returns the read and write channel device ids joined by ':'" do + expect(subject.device_id).to eql("0.0.0900:0.0.0901") + end + end + + describe "#propose_channels" do + context "when the read and write channel have not been initialized" do + let(:initialize_channels) { false } + let(:device_id) { "0.0.0800:0.0.0801" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + + before do + allow(builder).to receive(:device_id_from).with(write_channel).and_return(device_id) + allow(builder).to receive(:hwinfo).and_return(hwinfo) + end + + it "initializes them from the given busid" do + expect { builder.propose_channels }.to change { builder.device_id }.from(nil).to(device_id) + end + end + end + + describe "#proposal" do + context "when no device id has been initialized" do + let(:initialize_channels) { false } + it "proposes the channel device ids to be used" do + expect(subject).to receive(:propose_channels) + subject.proposal + end + end + + context "when the channel device ids have been set already" do + it "does not propose anything" do + expect(subject).to_not receive(:propose_channels) + subject.proposal + end + end + end +end diff --git a/test/y2network/interface_config_builders/lcs_test.rb b/test/y2network/interface_config_builders/lcs_test.rb new file mode 100644 index 000000000..9b617358c --- /dev/null +++ b/test/y2network/interface_config_builders/lcs_test.rb @@ -0,0 +1,146 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "yast" +require "y2network/interface_config_builders/lcs" +require "y2network/interface_type" + +describe Y2Network::InterfaceConfigBuilders::Lcs do + subject(:builder) do + res = Y2Network::InterfaceConfigBuilders::Lcs.new + res.name = "eth1" + res + end + + describe "#type" do + it "returns lcs type" do + expect(subject.type).to eq Y2Network::InterfaceType::LCS + end + end + + let(:executor) { double("Yast::Execute", on_target!: "") } + let(:initialize_channels) { true } + + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + builder.read_channel = "0.0.0900" if initialize_channels + builder.write_channel = "0.0.0901" if initialize_channels + end + + describe "#configure" do + it "tries to activate the group device associated with the defined device id" do + expect(Yast::Execute).to receive(:on_target!) + .with("/sbin/chzdev", "lcs", builder.device_id, "-e", + "protocol=#{builder.protocol}", "lancmd_timeout=5", + allowed_exitstatus: 0..255) + .and_return(0) + subject.configure + end + + context "when activated succesfully" do + it "returns true" do + expect(Yast::Execute).to receive(:on_target!).and_return(0) + expect(subject.configure).to eq(true) + end + end + + context "when failed the activation and returned a non zero return code" do + it "returns false" do + expect(Yast::Execute).to receive(:on_target!).and_return(34) + expect(subject.configure).to eq(false) + end + end + end + + describe "#configured_interface" do + before do + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", builder.device_id, "-c", "names", "-n"]) + .and_return("lcs1") + end + + it "obtains the network interface associated with builder device id" do + expect(subject.configured_interface).to eq("lcs1") + end + end + + describe "#device_id_from" do + context "given the read or write device id" do + let(:device_id) { "0.0.0800:0.0.0801" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + before do + allow(builder).to receive(:hwinfo).and_return(hwinfo) + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", "lcs", "-c", "id", "-n"]) + .and_return(device_id) + end + + it "obtains the triplet device ids listed by lszdev" do + expect(subject.device_id_from(hwinfo.busid)).to eq(device_id) + end + end + end + + describe "#device_id" do + it "returns the read and write channel device ids joined by ':'" do + expect(subject.device_id).to eql("0.0.0900:0.0.0901") + end + end + + describe "#propose_channels" do + context "when the read and write channel have not been initialized" do + let(:initialize_channels) { false } + let(:device_id) { "0.0.0800:0.0.0801" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + + before do + allow(builder).to receive(:device_id_from).with(write_channel).and_return(device_id) + allow(builder).to receive(:hwinfo).and_return(hwinfo) + end + + it "initializes them from the given busid" do + expect { builder.propose_channels }.to change { builder.device_id }.from(nil).to(device_id) + end + end + end + + describe "#proposal" do + context "when no device id has been initialized" do + let(:initialize_channels) { false } + it "proposes the channel device ids to be used" do + expect(subject).to receive(:propose_channels) + subject.proposal + end + end + + context "when the channel device ids have been set already" do + it "does not propose anything" do + expect(subject).to_not receive(:propose_channels) + subject.proposal + end + end + end + +end diff --git a/test/y2network/interface_config_builders/qeth_test.rb b/test/y2network/interface_config_builders/qeth_test.rb new file mode 100644 index 000000000..a25fb9036 --- /dev/null +++ b/test/y2network/interface_config_builders/qeth_test.rb @@ -0,0 +1,144 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "yast" +require "y2network/interface_config_builders/qeth" +require "y2network/interface_type" + +describe Y2Network::InterfaceConfigBuilders::Qeth do + subject(:builder) do + res = Y2Network::InterfaceConfigBuilders::Qeth.new + res.name = "eth0" + res + end + + let(:executor) { double("Yast::Execute", on_target!: "") } + let(:initialize_channels) { true } + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + if initialize_channels + builder.read_channel = "0.0.0800" + builder.write_channel = "0.0.0801" + builder.data_channel = "0.0.0802" + end + end + + describe "#type" do + it "returns qeth type" do + expect(subject.type).to eq Y2Network::InterfaceType::QETH + end + end + + describe "#configure" do + it "tries to activate the group device associated with the defined device id" do + expect(Yast::Execute).to receive(:on_target!) + .with("/sbin/chzdev", "qeth", builder.device_id, "-e", allowed_exitstatus: 0..255).and_return(0) + subject.configure + end + + context "when activated succesfully" do + it "returns true" do + expect(Yast::Execute).to receive(:on_target!).and_return(0) + expect(subject.configure).to eq(true) + end + end + + context "when failed the activation and returned a non zero return code" do + it "returns false" do + expect(Yast::Execute).to receive(:on_target!).and_return(34) + expect(subject.configure).to eq(false) + end + end + end + + describe "#configured_interface" do + before do + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", builder.device_id, "-c", "names", "-n"]) + .and_return("eth1") + end + + it "obtains the network interface associated with builder device id" do + expect(subject.configured_interface).to eq("eth1") + end + end + + describe "#device_id_from" do + context "given the read, write or data device id" do + let(:device_id) { "0.0.0700:0.0.0701:0.0.0702" } + let(:data_channel) { "0.0.0702" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => data_channel }) } + before do + allow(builder).to receive(:hwinfo).and_return(hwinfo) + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", "qeth", "-c", "id", "-n"]) + .and_return(device_id) + end + + it "obtains the triplet device ids listed by lszdev" do + expect(subject.device_id_from("0.0.0702")).to eq(device_id) + end + end + end + + describe "#device_id" do + it "returns the channel, write and data device ids joined by ':'" do + expect(subject.device_id).to eql("0.0.0800:0.0.0801:0.0.0802") + end + end + + describe "#propose_channels" do + context "when the read and write channel have not been initialized" do + let(:initialize_channels) { false } + let(:device_id) { "0.0.0800:0.0.0801:0.0802" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + + before do + allow(builder).to receive(:device_id_from).with(write_channel).and_return(device_id) + allow(builder).to receive(:hwinfo).and_return(hwinfo) + end + + it "initializes them from the given busid" do + expect { builder.propose_channels }.to change { builder.device_id }.from(nil).to(device_id) + end + end + end + + describe "#proposal" do + context "when no device id has been initialized" do + let(:initialize_channels) { false } + it "proposes the channel device ids to be used" do + expect(subject).to receive(:propose_channels) + subject.proposal + end + end + + context "when the channel device ids have been set already" do + it "does not propose anything" do + expect(subject).to_not receive(:propose_channels) + subject.proposal + end + end + end +end diff --git a/test/y2network/widgets/s390_channels_test.rb b/test/y2network/widgets/s390_channels_test.rb new file mode 100644 index 000000000..729241d35 --- /dev/null +++ b/test/y2network/widgets/s390_channels_test.rb @@ -0,0 +1,111 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/widgets/s390_channels" +require "y2network/interface_config_builder" + +require "cwm/rspec" + +describe Y2Network::Widgets::S390ReadChannel do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + let(:read_channel) { "0.0.0700" } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" + + describe "#init" do + it "initializes the widget value with the device read channel" do + builder.read_channel = read_channel + expect(subject).to receive(:value=).with(read_channel) + subject.init + end + end + + describe "#store" do + before do + allow(subject).to receive(:value).and_return("0.0.0800") + end + + it "modifies the device read channel with the widget value" do + builder.read_channel = read_channel + expect { subject.store }.to change { builder.read_channel }.from(read_channel).to("0.0.0800") + end + end +end + +describe Y2Network::Widgets::S390WriteChannel do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + let(:write_channel) { "0.0.0701" } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" + + describe "#init" do + it "initializes the widget value with the device write channel" do + builder.write_channel = write_channel + expect(subject).to receive(:value=).with(write_channel) + subject.init + end + end + + describe "#store" do + before do + allow(subject).to receive(:value).and_return("0.0.0801") + end + + it "modifies the device write channel with the widget value" do + builder.write_channel = write_channel + expect { subject.store }.to change { builder.write_channel }.from(write_channel).to("0.0.0801") + end + end +end + +describe Y2Network::Widgets::S390DataChannel do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + let(:data_channel) { "0.0.0702" } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" + + describe "#init" do + it "initializes the widget value with the device data channel" do + builder.data_channel = data_channel + expect(subject).to receive(:value=).with(data_channel) + subject.init + end + end + + describe "#store" do + before do + allow(subject).to receive(:value).and_return("0.0.0802") + end + + it "modifies the device data channel with the widget value" do + builder.data_channel = data_channel + expect { subject.store }.to change { builder.data_channel }.from(data_channel).to("0.0.0802") + end + end +end + +describe Y2Network::Widgets::S390Channels do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + subject { described_class.new(builder) } + include_examples "CWM::CustomWidget" +end diff --git a/test/y2network/widgets/s390_common_test.rb b/test/y2network/widgets/s390_common_test.rb new file mode 100644 index 000000000..dd126c5d5 --- /dev/null +++ b/test/y2network/widgets/s390_common_test.rb @@ -0,0 +1,51 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" +require "y2network/widgets/s390_common" +require "y2network/interface_config_builder" + +require "cwm/rspec" + +describe Y2Network::Widgets::S390LanCmdTimeout do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("lcs") } + subject { described_class.new(builder) } + include_examples "CWM::InputField" +end + +describe Y2Network::Widgets::S390Protocol do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("ctc") } + subject { described_class.new(builder) } + + include_examples "CWM::ComboBox" +end + +describe Y2Network::Widgets::S390PortNumber do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + subject { described_class.new(builder) } + + include_examples "CWM::ComboBox" +end + +describe Y2Network::Widgets::S390Attributes do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" +end From ca52539dca22c986204668a745491add7e00054e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 28 Aug 2019 17:36:20 +0100 Subject: [PATCH 438/471] Added s390 device activator classes (based on CR). --- src/include/network/lan/hardware.rb | 23 +-- src/lib/y2network/connection_config/ctc.rb | 7 +- src/lib/y2network/connection_config/lcs.rb | 11 -- src/lib/y2network/dialogs/s390.rb | 2 - .../y2network/dialogs/s390_ctc_activation.rb | 6 +- .../dialogs/s390_device_activation.rb | 55 +++++-- .../y2network/dialogs/s390_lcs_activation.rb | 8 +- .../y2network/dialogs/s390_qeth_activation.rb | 10 +- src/lib/y2network/interface_config_builder.rb | 8 +- .../interface_config_builders/ctc.rb | 36 ----- .../interface_config_builders/lcs.rb | 40 ----- .../interface_config_builders/qeth.rb | 58 ------- src/lib/y2network/interfaces_collection.rb | 10 ++ src/lib/y2network/s390_device_activator.rb | 96 ++++++++++++ .../y2network/s390_device_activators/ctc.rb | 54 +++++++ .../y2network/s390_device_activators/lcs.rb | 33 ++++ .../y2network/s390_device_activators/qeth.rb | 56 +++++++ src/lib/y2network/widgets/s390_common.rb | 25 +++- .../dialogs/s390_ctc_activation_test.rb | 5 +- .../dialogs/s390_device_activation_test.rb | 56 ++++++- .../dialogs/s390_lcs_activation_test.rb | 3 +- .../dialogs/s390_qeth_activation_test.rb | 3 +- .../interface_config_builder_test.rb | 9 ++ .../interface_config_builders/ctc_test.rb | 104 ------------- .../interface_config_builders/lcs_test.rb | 106 ------------- .../interface_config_builders/qeth_test.rb | 104 ------------- test/y2network/s390_device_activator_test.rb | 54 +++++++ .../s390_device_activators/ctc_test.rb | 140 +++++++++++++++++ .../s390_device_activators/lcs_test.rb | 68 +++++++++ .../s390_device_activators/qeth_test.rb | 141 ++++++++++++++++++ test/y2network/widgets/s390_common_test.rb | 26 +++- 31 files changed, 838 insertions(+), 519 deletions(-) delete mode 100644 src/lib/y2network/dialogs/s390.rb create mode 100644 src/lib/y2network/s390_device_activator.rb create mode 100644 src/lib/y2network/s390_device_activators/ctc.rb create mode 100644 src/lib/y2network/s390_device_activators/lcs.rb create mode 100644 src/lib/y2network/s390_device_activators/qeth.rb create mode 100644 test/y2network/s390_device_activator_test.rb create mode 100644 test/y2network/s390_device_activators/ctc_test.rb create mode 100644 test/y2network/s390_device_activators/lcs_test.rb create mode 100644 test/y2network/s390_device_activators/qeth_test.rb diff --git a/src/include/network/lan/hardware.rb b/src/include/network/lan/hardware.rb index 0d9abb8cd..c1d71aa5a 100644 --- a/src/include/network/lan/hardware.rb +++ b/src/include/network/lan/hardware.rb @@ -29,7 +29,7 @@ include Yast::UIShortcuts -require "y2network/dialogs/s390" +require "y2network/dialogs/s390_device_activation" module Yast module NetworkLanHardwareInclude @@ -74,25 +74,8 @@ def initHelp # S/390 devices configuration dialog # @return dialog result def S390Dialog(builder:) - dialog = Y2Network::Dialogs::S390DeviceActivation.for(builder.type) - ret = dialog ? dialog.run(builder) : :abort - - if ret == :next - configured = builder.configure - builder.name = builder.configured_interface if configured - builder.interface.name = builder.name if configured && builder.interface - if !configured || builder.name.empty? - Popup.Error( - _( - "An error occurred while creating device.\nSee YaST log for details." - ) - ) - - ret = nil - end - end - - ret + dialog = Y2Network::Dialogs::S390DeviceActivation.for(builder) + dialog ? dialog.run : :abort end end end diff --git a/src/lib/y2network/connection_config/ctc.rb b/src/lib/y2network/connection_config/ctc.rb index 360d3e072..a13e734b2 100644 --- a/src/lib/y2network/connection_config/ctc.rb +++ b/src/lib/y2network/connection_config/ctc.rb @@ -46,7 +46,7 @@ class Ctc < Base # @return [String] write device bus id attr_accessor :write_channel # @return [Integer] connection protocol (0, 1, 3, or 4) - # 0 Compatibility with peers other than OS/390®. + # 0 Compatibility with peers other than OS/390®. (default) # 1 Enhanced package checking for Linux peers. # 3 For compatibility with OS/390 or z/OS peers. # 4 For MPC connections to VTAM on traditional mainframe operating systems. @@ -54,6 +54,11 @@ class Ctc < Base # @see https://github.com/SUSE/s390-tools/blob/master/ctc_configure#L16 attr_accessor :protocol + def initialize + super() + @protocol = 0 + end + def ==(other) return false unless super diff --git a/src/lib/y2network/connection_config/lcs.rb b/src/lib/y2network/connection_config/lcs.rb index c6c299a7a..691591296 100644 --- a/src/lib/y2network/connection_config/lcs.rb +++ b/src/lib/y2network/connection_config/lcs.rb @@ -43,16 +43,6 @@ class Lcs < Base attr_accessor :read_channel # @return [String] write device bus id attr_accessor :write_channel - # @return [Integer] connection protocol (0, 1, 3, or 4) - # 0 Compatibility with peers other than OS/390®. - # 1 Enhanced package checking for Linux peers. - # 3 For compatibility with OS/390 or z/OS peers. - # 4 For MPC connections to VTAM on traditional mainframe operating systems. - # @see https://github.com/SUSE/s390-tools/blob/master/ctc_configure#L16 - # - # # FIXME: At lease in linuxrc the protocol is not needed anymore for lcs - # interfaces (once replaced ctc_configure by chzdev) - attr_accessor :protocol # The time the driver wait for a reply issuing a LAN command. # # @return [Integer] lcs lancmd timeout (default 5s) @@ -62,7 +52,6 @@ class Lcs < Base # Constructor def initialize super() - @protocol = 0 @timeout = 5 end diff --git a/src/lib/y2network/dialogs/s390.rb b/src/lib/y2network/dialogs/s390.rb deleted file mode 100644 index 56d54fdba..000000000 --- a/src/lib/y2network/dialogs/s390.rb +++ /dev/null @@ -1,2 +0,0 @@ -require "y2network/dialogs/s390_qeth_activation" -require "y2network/dialogs/s390_ctc_activation" diff --git a/src/lib/y2network/dialogs/s390_ctc_activation.rb b/src/lib/y2network/dialogs/s390_ctc_activation.rb index b43da40e8..50a337b44 100644 --- a/src/lib/y2network/dialogs/s390_ctc_activation.rb +++ b/src/lib/y2network/dialogs/s390_ctc_activation.rb @@ -54,15 +54,15 @@ def contents private def protocol_widget - Y2Network::Widgets::S390Protocol.new(@settings) + Y2Network::Widgets::S390Protocol.new(builder) end def read_channel_widget - Y2Network::Widgets::S390ReadChannel.new(@settings) + Y2Network::Widgets::S390ReadChannel.new(builder) end def write_channel_widget - Y2Network::Widgets::S390WriteChannel.new(@settings) + Y2Network::Widgets::S390WriteChannel.new(builder) end end end diff --git a/src/lib/y2network/dialogs/s390_device_activation.rb b/src/lib/y2network/dialogs/s390_device_activation.rb index 0d9b421aa..be091e7ac 100644 --- a/src/lib/y2network/dialogs/s390_device_activation.rb +++ b/src/lib/y2network/dialogs/s390_device_activation.rb @@ -18,6 +18,7 @@ # find current contact information at www.suse.com. require "cwm/dialog" +require "y2network/s390_device_activator" require "y2network/widgets/s390_common" require "y2network/widgets/s390_channels" @@ -25,30 +26,41 @@ module Y2Network module Dialogs # Base class dialog for activating S390 devices class S390DeviceActivation < CWM::Dialog - # @param type [Y2Network::InterfaceType] type of device + # @param builder [Y2Network::InterfaceConfigBuilder] # @return [S390DeviceActivation, nil] - def self.for(type) - case type.short_name + def self.for(builder) + return nil unless builder.type + case builder.type.short_name when "qeth", "hsi" require "y2network/dialogs/s390_qeth_activation" - Y2Network::Dialogs::S390QethActivation + require "y2network/s390_device_activators/qeth" + activator = S390DeviceActivators::Qeth.new(builder) + Y2Network::Dialogs::S390QethActivation.new(activator) when "ctc" require "y2network/dialogs/s390_ctc_activation" - Y2Network::Dialogs::S390CtcActivation + require "y2network/s390_device_activators/ctc" + activator = S390DeviceActivators::Ctc.new(builder) + Y2Network::Dialogs::S390CtcActivation.new(activator) when "lcs" require "y2network/dialogs/s390_lcs_activation" - Y2Network::Dialogs::S390LcsActivation + require "y2network/s390_device_activators/lcs" + activator = S390DeviceActivators::Lcs.new(builder) + Y2Network::Dialogs::S390LcsActivation.new(activator) end end + attr_reader :builder + attr_reader :activator + # Constructor # - # @param settings [Y2Network::InterfaceConfigBuilder] - def initialize(settings) + # @param activator [Y2Network::S390DeviceActivator] + def initialize(activator) textdomain "network" - @settings = settings - @settings.proposal + @activator = activator + @activator.proposal + @builder = activator.builder end def title @@ -59,6 +71,29 @@ def contents Empty() end + def run + ret = super + if ret == :next + configured = activator.configure + builder.name = activator.configured_interface if configured + # TODO: Refresh the list of interfaces in yast_config. Take into + # account that the interface in yast_config does not have a nem so + # the builder.interface is probably nil and should be obtained + # through the busid. + if !configured || builder.name.empty? + Yast::Popup.Error( + _( + "An error occurred while creating device.\nSee YaST log for details." + ) + ) + + ret = nil + end + end + + ret + end + def abort_handler Yast::Popup.ReallyAbort(true) end diff --git a/src/lib/y2network/dialogs/s390_lcs_activation.rb b/src/lib/y2network/dialogs/s390_lcs_activation.rb index 7d3190d9b..7cf217862 100644 --- a/src/lib/y2network/dialogs/s390_lcs_activation.rb +++ b/src/lib/y2network/dialogs/s390_lcs_activation.rb @@ -54,19 +54,19 @@ def contents private def protocol_widget - Y2Network::Widgets::S390Protocol.new(@settings) + Y2Network::Widgets::S390Protocol.new(builder) end def read_channel_widget - Y2Network::Widgets::S390ReadChannel.new(@settings) + Y2Network::Widgets::S390ReadChannel.new(builder) end def write_channel_widget - Y2Network::Widgets::S390WriteChannel.new(@settings) + Y2Network::Widgets::S390WriteChannel.new(builder) end def timeout_widget - Y2network::Widgets::S390LanCmdTimeout.new(@settings) + Y2network::Widgets::S390LanCmdTimeout.new(builder) end end end diff --git a/src/lib/y2network/dialogs/s390_qeth_activation.rb b/src/lib/y2network/dialogs/s390_qeth_activation.rb index 11b620df7..35c042845 100644 --- a/src/lib/y2network/dialogs/s390_qeth_activation.rb +++ b/src/lib/y2network/dialogs/s390_qeth_activation.rb @@ -56,23 +56,23 @@ def contents private def s390_port_number - Y2Network::Widgets::S390PortNumber.new(@settings) + Y2Network::Widgets::S390PortNumber.new(builder) end def s390_attributes - Y2Network::Widgets::S390Attributes.new(@settings) + Y2Network::Widgets::S390Attributes.new(builder) end def s390_ip_takeover - Y2Network::Widgets::S390IPAddressTakeover.new(@settings) + Y2Network::Widgets::S390IPAddressTakeover.new(builder) end def s390_channels - Y2Network::Widgets::S390Channels.new(@settings) + Y2Network::Widgets::S390Channels.new(builder) end def s390_layer2 - Y2Network::Widgets::S390Layer2.new(@settings) + Y2Network::Widgets::S390Layer2.new(builder) end end end diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index 2d55b55da..e65109548 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -378,12 +378,16 @@ def configure_as_slave self.aliases = [] end - private + def hwinfo_from(info) + @hwinfo = Hwinfo.new(info) + end def hwinfo - @hwinfo ||= Hwinfo.new(name: name) + @hwinfo ||= Hwinfo.for(name) end + private + def ip_config_default return @connection_config.ip if @connection_config.ip @connection_config.ip = ConnectionConfig::IPConfig.new(IPAddress.new("0.0.0.0")) diff --git a/src/lib/y2network/interface_config_builders/ctc.rb b/src/lib/y2network/interface_config_builders/ctc.rb index 9028a58e8..45b8b489b 100644 --- a/src/lib/y2network/interface_config_builders/ctc.rb +++ b/src/lib/y2network/interface_config_builders/ctc.rb @@ -36,42 +36,6 @@ def initialize(config: nil) :read_channel, :read_channel=, :write_channel, :write_channel=, :protocol, :protocol= - - def device_id - return if read_channel.to_s.empty? - - "#{read_channel}:#{write_channel}" - end - - def device_id_from(channel) - cmd = "/sbin/lszdev ctc -c id -n".split(" ") - - Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| - d.include? channel - end - end - - def configure - cmd = "/sbin/chzdev ctc #{device_id} -e protocol=#{protocol}".split(" ") - - Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? - end - - def configured_interface - cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ") - - Yast::Execute.stdout.on_target!(cmd).chomp - end - - def propose_channels - id = device_id_from(hwinfo.busid) - return unless id - self.read_channel, self.write_channel = id.split(":") - end - - def proposal - propose_channels unless device_id - end end end end diff --git a/src/lib/y2network/interface_config_builders/lcs.rb b/src/lib/y2network/interface_config_builders/lcs.rb index 49817acee..25c48f632 100644 --- a/src/lib/y2network/interface_config_builders/lcs.rb +++ b/src/lib/y2network/interface_config_builders/lcs.rb @@ -37,46 +37,6 @@ def initialize(config: nil) :write_channel, :write_channel=, :protocol, :protocol=, :timeout, :timeout= - - def device_id - return if read_channel.to_s.empty? - - "#{read_channel}:#{write_channel}" - end - - def device_id_from(busid) - cmd = "/sbin/lszdev lcs -c id -n".split(" ") - - Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| - d.include? busid - end - end - - def configure_attributes - "protocol=#{protocol} lancmd_timeout=#{timeout.to_i}".split(" ") - end - - def configure - cmd = "/sbin/chzdev lcs #{device_id} -e ".split(" ").concat(configure_attributes) - - Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? - end - - def configured_interface - cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ") - - Yast::Execute.stdout.on_target!(cmd).chomp - end - - def propose_channels - id = device_id_from(hwinfo.busid) - return unless id - self.read_channel, self.write_channel = id.split(":") - end - - def proposal - propose_channels unless device_id - end end end end diff --git a/src/lib/y2network/interface_config_builders/qeth.rb b/src/lib/y2network/interface_config_builders/qeth.rb index 568daf7fb..9286bf00a 100644 --- a/src/lib/y2network/interface_config_builders/qeth.rb +++ b/src/lib/y2network/interface_config_builders/qeth.rb @@ -47,64 +47,6 @@ def initialize(config: nil) :lladdress, :lladdress=, :ipa_takeover, :ipa_takeover=, :attributes, :attributes= - - # @return [Array] - def configure_attributes - return [] unless attributes - - attributes.split(" ") - end - - # The device id to be used by lszdev or chzdev commands - # - # @return [String] - def device_id - return if read_channel.to_s.empty? - - [read_channel, write_channel, data_channel].join(":") - end - - # Returns the complete device id which contains the given channel - # - # @param channel [String] - # @return [String] - def device_id_from(channel) - cmd = "/sbin/lszdev qeth -c id -n".split(" ") - - Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| - d.include? channel - end - end - - # It tries to enable the interface with the configured device id - # - # @return [Boolean] true when enabled - def configure - cmd = "/sbin/chzdev qeth #{device_id} -e".split(" ").concat(configure_attributes) - - Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? - end - - # Obtains the enabled interface name associated with the device id - # - # @return [String] device name - def configured_interface - cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ").concat(configure_attributes) - - Yast::Execute.stdout.on_target!(cmd).chomp - end - - # Modifies the read, write and data channel from the the device id - def propose_channels - id = device_id_from(hwinfo.busid) - return unless id - self.read_channel, self.write_channel, self.data_channel = id.split(":") - end - - # Makes a new channels proposal only if not already set - def proposal - propose_channels unless device_id - end end end end diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index 50cc5b030..f9cbb6859 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -68,6 +68,16 @@ def by_name(name) end end + # Returns an interface with the given hardware busid if present + # + # @param busid [String] interface busid ("0.0.0700", "0000:00:19.0", ...) + # @return [Interface,nil] Interface with the given busid or nil if not found + def by_busid(busid) + interfaces.find do |iface| + iface.hardware.busid == busid + end + end + # Returns list of interfaces of given type # # @param type [InterfaceType] device type diff --git a/src/lib/y2network/s390_device_activator.rb b/src/lib/y2network/s390_device_activator.rb new file mode 100644 index 000000000..424336be7 --- /dev/null +++ b/src/lib/y2network/s390_device_activator.rb @@ -0,0 +1,96 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "yast" +require "yast2/execute" + +module Y2Network + class S390DeviceActivator + extend Forwardable + include Yast::Logger + + attr_accessor :builder + + # Load fresh instace of device activator for given interface config builder + def self.for(builder) + type = builder.type + require "y2network/s390_device_activators/#{type.file_name}" + S390DeviceActivators.const_get(type.class_name).new(builder) + rescue LoadError => e + log.info "Specialized device activator for #{type.short_name} not found. #{e.inspect}" + nil + end + + def initialize(builder) + @builder = builder + end + + # @return [Array] + def configure_attributes + [] + end + + def type + builder.type.short_name + end + + # The device id to be used by lszdev or chzdev commands + # + # @return [String, nil] + def device_id + nil + end + + # Returns the complete device id which contains the given channel + # + # @param channel [String] + # @return [String] + def device_id_from(channel) + cmd = "/sbin/lszdev #{type} -c id -n".split(" ") + + Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| + d.include? channel + end + end + + # It tries to enable the interface with the configured device id + # + # @return [Boolean] true when enabled + def configure + return false unless device_id + cmd = "/sbin/chzdev #{type} #{device_id} -e".split(" ").concat(configure_attributes) + + Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? + end + + # Obtains the enabled interface name associated with the device id + # + # @return [String] device name + def configured_interface + return "" unless device_id + cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ") + + Yast::Execute.stdout.on_target!(cmd).chomp + end + + # Makes a new proposal + def proposal + end + end +end diff --git a/src/lib/y2network/s390_device_activators/ctc.rb b/src/lib/y2network/s390_device_activators/ctc.rb new file mode 100644 index 000000000..59d2c6a83 --- /dev/null +++ b/src/lib/y2network/s390_device_activators/ctc.rb @@ -0,0 +1,54 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/s390_device_activator" + +module Y2Network + module S390DeviceActivators + class Ctc < S390DeviceActivator + def_delegators :@builder, + :read_channel, :read_channel=, + :write_channel, :write_channel=, + :hwinfo, :protocol + + def device_id + return if read_channel.to_s.empty? + + [read_channel, write_channel].join(":") + end + + def configure_attributes + return [] unless builder.protocol + + ["protocol=#{builder.protocol}"] + end + + # Modifies the read, write and data channel from the the device id + def propose_channels + id = device_id_from(hwinfo.busid) + return unless id + self.read_channel, self.write_channel = id.split(":") + end + + def proposal + propose_channels unless device_id + end + end + end +end diff --git a/src/lib/y2network/s390_device_activators/lcs.rb b/src/lib/y2network/s390_device_activators/lcs.rb new file mode 100644 index 000000000..6af8c2f88 --- /dev/null +++ b/src/lib/y2network/s390_device_activators/lcs.rb @@ -0,0 +1,33 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/s390_device_activators/ctc" + +module Y2Network + module S390DeviceActivators + # The Lcs device activator is based in Ctc + class Lcs < Ctc + def configure_attributes + return [] unless builder.timeout + + ["lancmd_timeout=#{builder.timeout}"] + end + end + end +end diff --git a/src/lib/y2network/s390_device_activators/qeth.rb b/src/lib/y2network/s390_device_activators/qeth.rb new file mode 100644 index 000000000..fd2eaaac6 --- /dev/null +++ b/src/lib/y2network/s390_device_activators/qeth.rb @@ -0,0 +1,56 @@ +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require "y2network/s390_device_activator" + +module Y2Network + module S390DeviceActivators + class Qeth < S390DeviceActivator + def_delegators :@builder, + :read_channel, :read_channel=, + :write_channel, :write_channel=, + :data_channel, :data_channel=, + :hwinfo, :attributes + + def device_id + return if read_channel.to_s.empty? + + [read_channel, write_channel, data_channel].join(":") + end + + # @return [Array] + def configure_attributes + return [] unless attributes + + attributes.split(" ") + end + + # Modifies the read, write and data channel from the the device id + def propose_channels + id = device_id_from(hwinfo.busid) + return unless id + self.read_channel, self.write_channel, self.data_channel = id.split(":") + end + + def proposal + propose_channels unless device_id + end + end + end +end diff --git a/src/lib/y2network/widgets/s390_common.rb b/src/lib/y2network/widgets/s390_common.rb index 0dff57bc5..ded7f832b 100644 --- a/src/lib/y2network/widgets/s390_common.rb +++ b/src/lib/y2network/widgets/s390_common.rb @@ -54,6 +54,7 @@ def help end end + # Widget for setting the Ctc device protocol to be used class S390Protocol < CWM::ComboBox # Constructor # @@ -66,7 +67,7 @@ def initialize(settings) # @see CWM::AbstractWidget def init - self.value = @settings.protocol + self.value = @settings.protocol.to_s end # @see CWM::AbstractWidget @@ -90,7 +91,7 @@ def items # @see CWM::AbstractWidget def store - @settings.protocol = value + @settings.protocol = value.to_i end # @see CWM::AbstractWidget @@ -99,6 +100,7 @@ def help end end + # Widget for specifying whether use the port number 0 or 1 class S390PortNumber < CWM::ComboBox # Constructor # @@ -135,6 +137,8 @@ def help end end + # This widget permits to pass defined any extra attribute to set during + # Qeth device activation class S390Attributes < CWM::InputField # Constructor # @@ -171,6 +175,7 @@ def store end end + # Checkbox for enabling IPA Takeover in the configured interface class S390IPAddressTakeover < CWM::CheckBox # Constructor # @@ -202,6 +207,9 @@ def store end end + # This custom widget contents a checkbox for enabling the layer2 support + # and an input field for setting the mac address to be used in case of + # enablement. class S390Layer2 < CWM::CustomWidget # Constructor # @@ -212,6 +220,7 @@ def initialize(settings) self.handle_all_events = true end + # @see CWM::AbstractWidget def contents VBox( Left(support_widget), @@ -219,13 +228,15 @@ def contents ) end + # @see CWM::AbstractWidget def init refresh end + # @see CWM::AbstractWidget def handle(event) case event["ID"] - when support_widget.widget_id, mac_address_widget.widget_id + when support_widget.widget_id refresh end @@ -247,6 +258,7 @@ def mac_address_widget end end + # Widget for enabling layer2 support in the configured device class S390Layer2Support < CWM::CheckBox # Constructor # @@ -263,6 +275,7 @@ def init # @see CWM::AbstractWidget def opt + # Needed for handling the event in other widgets that contents it. [:notify] end @@ -283,6 +296,7 @@ def store end end + # Widget for setting the mac address to be used in case of layer2 supported class S390Layer2Address < CWM::InputField # Constructor # @@ -297,11 +311,6 @@ def init self.value = @settings.lladdress end - # @see CWM::AbstractWidget - def opt - [:notify] - end - # @see CWM::AbstractWidget def label _("Layer2 MAC Address") diff --git a/test/y2network/dialogs/s390_ctc_activation_test.rb b/test/y2network/dialogs/s390_ctc_activation_test.rb index c5eba4cda..9a4edd97c 100644 --- a/test/y2network/dialogs/s390_ctc_activation_test.rb +++ b/test/y2network/dialogs/s390_ctc_activation_test.rb @@ -24,7 +24,10 @@ require "y2network/interface_config_builder" describe Y2Network::Dialogs::S390CtcActivation do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("ctc")) } + let(:builder) { Y2Network::InterfaceConfigBuilder.for("ctc") } + let(:activator) { Y2Network::S390DeviceActivator.for(builder) } + + subject { described_class.new(activator) } include_examples "CWM::Dialog" end diff --git a/test/y2network/dialogs/s390_device_activation_test.rb b/test/y2network/dialogs/s390_device_activation_test.rb index 7b6e3c1e6..aeef33770 100644 --- a/test/y2network/dialogs/s390_device_activation_test.rb +++ b/test/y2network/dialogs/s390_device_activation_test.rb @@ -24,10 +24,64 @@ require "y2network/interface_config_builder" describe Y2Network::Dialogs::S390DeviceActivation do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("qeth")) } + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + let(:activator) { Y2Network::S390DeviceActivator.for(builder) } + + subject { described_class.new(activator) } include_examples "CWM::Dialog" + describe ".new" do + it "creates a proposal for the configured device" do + expect(activator).to receive(:proposal) + described_class.new(activator) + end + end + + describe "#run" do + let(:configured) { true } + let(:dialog_action) { :next } + + before do + allow(activator).to receive(:configure).and_return(configured) + allow(activator).to receive(:configured_interface).and_return("eth4") + allow(subject).to receive(:cwm_show).and_return(dialog_action) + end + + context "when going :next" do + it "tries to activate the s390 device" do + expect(activator).to receive(:configure) + subject.run + end + + context "when activated the device" do + it "sets the builder name with the associated interface" do + subject.run + expect(builder.name).to eql("eth4") + end + + it "returns :next" do + expect(subject.run).to eql(:next) + end + end + + context "when failed the activation" do + let(:configured) { false } + it "popups an error" do + expect(Yast::Popup).to receive(:Error) + subject.run + end + + it "returns nil" do + expect(subject.run).to be_nil + end + end + end + + context "when pressed :abort" do + end + end + describe "#abort_handler" do it "asks for abort confirmation" do expect(Yast::Popup).to receive(:ReallyAbort).with(true) diff --git a/test/y2network/dialogs/s390_lcs_activation_test.rb b/test/y2network/dialogs/s390_lcs_activation_test.rb index 7d2d1fbe0..62bc87f84 100644 --- a/test/y2network/dialogs/s390_lcs_activation_test.rb +++ b/test/y2network/dialogs/s390_lcs_activation_test.rb @@ -24,7 +24,8 @@ require "y2network/interface_config_builder" describe Y2Network::Dialogs::S390LcsActivation do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("lcs")) } + let(:builder) { Y2Network::InterfaceConfigBuilder.for("lcs") } + subject { described_class.for(builder) } include_examples "CWM::Dialog" end diff --git a/test/y2network/dialogs/s390_qeth_activation_test.rb b/test/y2network/dialogs/s390_qeth_activation_test.rb index 7fa970f61..6439c11fe 100644 --- a/test/y2network/dialogs/s390_qeth_activation_test.rb +++ b/test/y2network/dialogs/s390_qeth_activation_test.rb @@ -24,7 +24,8 @@ require "y2network/interface_config_builder" describe Y2Network::Dialogs::S390QethActivation do - subject { described_class.new(Y2Network::InterfaceConfigBuilder.for("qeth")) } + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + subject { described_class.for(builder) } include_examples "CWM::Dialog" end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 38886bb37..c4100978c 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -289,4 +289,13 @@ end end end + + describe "#hwinfo_from" do + let(:hwinfo) { { "dev_name" => "", "busid" => "0.0.0700" } } + + it "overrides the builder hwinfo with the given hardware info" do + config_builder.hwinfo_from(hwinfo) + expect(config_builder.hwinfo.busid).to eq("0.0.0700") + end + end end diff --git a/test/y2network/interface_config_builders/ctc_test.rb b/test/y2network/interface_config_builders/ctc_test.rb index 80326cb54..7c55571c8 100644 --- a/test/y2network/interface_config_builders/ctc_test.rb +++ b/test/y2network/interface_config_builders/ctc_test.rb @@ -32,113 +32,9 @@ res end - let(:executor) { double("Yast::Execute", on_target!: "") } - let(:initialize_channels) { true } - - before do - allow(Yast::Execute).to receive(:stdout).and_return(executor) - builder.read_channel = "0.0.0900" if initialize_channels - builder.write_channel = "0.0.0901" if initialize_channels - end - describe "#type" do it "returns ctc type" do expect(subject.type).to eq Y2Network::InterfaceType::CTC end end - - describe "#configure" do - it "tries to activate the group device associated with the defined device id" do - expect(Yast::Execute).to receive(:on_target!) - .with("/sbin/chzdev", "ctc", builder.device_id, "-e", - "protocol=#{builder.protocol}", allowed_exitstatus: 0..255) - .and_return(0) - subject.configure - end - - context "when activated succesfully" do - it "returns true" do - expect(Yast::Execute).to receive(:on_target!).and_return(0) - expect(subject.configure).to eq(true) - end - end - - context "when failed the activation and returned a non zero return code" do - it "returns false" do - expect(Yast::Execute).to receive(:on_target!).and_return(34) - expect(subject.configure).to eq(false) - end - end - end - - describe "#configured_interface" do - before do - allow(executor).to receive(:on_target!) - .with(["/sbin/lszdev", builder.device_id, "-c", "names", "-n"]) - .and_return("ctc1") - end - - it "obtains the network interface associated with builder device id" do - expect(subject.configured_interface).to eq("ctc1") - end - end - - describe "#device_id_from" do - context "given the read or write device id" do - let(:device_id) { "0.0.0800:0.0.0801" } - let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } - before do - allow(builder).to receive(:hwinfo).and_return(hwinfo) - allow(executor).to receive(:on_target!) - .with(["/sbin/lszdev", "ctc", "-c", "id", "-n"]) - .and_return(device_id) - end - - it "obtains the triplet device ids listed by lszdev" do - expect(subject.device_id_from(hwinfo.busid)).to eq(device_id) - end - end - end - - describe "#device_id" do - it "returns the read and write channel device ids joined by ':'" do - expect(subject.device_id).to eql("0.0.0900:0.0.0901") - end - end - - describe "#propose_channels" do - context "when the read and write channel have not been initialized" do - let(:initialize_channels) { false } - let(:device_id) { "0.0.0800:0.0.0801" } - let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } - - before do - allow(builder).to receive(:device_id_from).with(write_channel).and_return(device_id) - allow(builder).to receive(:hwinfo).and_return(hwinfo) - end - - it "initializes them from the given busid" do - expect { builder.propose_channels }.to change { builder.device_id }.from(nil).to(device_id) - end - end - end - - describe "#proposal" do - context "when no device id has been initialized" do - let(:initialize_channels) { false } - it "proposes the channel device ids to be used" do - expect(subject).to receive(:propose_channels) - subject.proposal - end - end - - context "when the channel device ids have been set already" do - it "does not propose anything" do - expect(subject).to_not receive(:propose_channels) - subject.proposal - end - end - end end diff --git a/test/y2network/interface_config_builders/lcs_test.rb b/test/y2network/interface_config_builders/lcs_test.rb index 9b617358c..5060b7e49 100644 --- a/test/y2network/interface_config_builders/lcs_test.rb +++ b/test/y2network/interface_config_builders/lcs_test.rb @@ -37,110 +37,4 @@ expect(subject.type).to eq Y2Network::InterfaceType::LCS end end - - let(:executor) { double("Yast::Execute", on_target!: "") } - let(:initialize_channels) { true } - - before do - allow(Yast::Execute).to receive(:stdout).and_return(executor) - builder.read_channel = "0.0.0900" if initialize_channels - builder.write_channel = "0.0.0901" if initialize_channels - end - - describe "#configure" do - it "tries to activate the group device associated with the defined device id" do - expect(Yast::Execute).to receive(:on_target!) - .with("/sbin/chzdev", "lcs", builder.device_id, "-e", - "protocol=#{builder.protocol}", "lancmd_timeout=5", - allowed_exitstatus: 0..255) - .and_return(0) - subject.configure - end - - context "when activated succesfully" do - it "returns true" do - expect(Yast::Execute).to receive(:on_target!).and_return(0) - expect(subject.configure).to eq(true) - end - end - - context "when failed the activation and returned a non zero return code" do - it "returns false" do - expect(Yast::Execute).to receive(:on_target!).and_return(34) - expect(subject.configure).to eq(false) - end - end - end - - describe "#configured_interface" do - before do - allow(executor).to receive(:on_target!) - .with(["/sbin/lszdev", builder.device_id, "-c", "names", "-n"]) - .and_return("lcs1") - end - - it "obtains the network interface associated with builder device id" do - expect(subject.configured_interface).to eq("lcs1") - end - end - - describe "#device_id_from" do - context "given the read or write device id" do - let(:device_id) { "0.0.0800:0.0.0801" } - let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } - before do - allow(builder).to receive(:hwinfo).and_return(hwinfo) - allow(executor).to receive(:on_target!) - .with(["/sbin/lszdev", "lcs", "-c", "id", "-n"]) - .and_return(device_id) - end - - it "obtains the triplet device ids listed by lszdev" do - expect(subject.device_id_from(hwinfo.busid)).to eq(device_id) - end - end - end - - describe "#device_id" do - it "returns the read and write channel device ids joined by ':'" do - expect(subject.device_id).to eql("0.0.0900:0.0.0901") - end - end - - describe "#propose_channels" do - context "when the read and write channel have not been initialized" do - let(:initialize_channels) { false } - let(:device_id) { "0.0.0800:0.0.0801" } - let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } - - before do - allow(builder).to receive(:device_id_from).with(write_channel).and_return(device_id) - allow(builder).to receive(:hwinfo).and_return(hwinfo) - end - - it "initializes them from the given busid" do - expect { builder.propose_channels }.to change { builder.device_id }.from(nil).to(device_id) - end - end - end - - describe "#proposal" do - context "when no device id has been initialized" do - let(:initialize_channels) { false } - it "proposes the channel device ids to be used" do - expect(subject).to receive(:propose_channels) - subject.proposal - end - end - - context "when the channel device ids have been set already" do - it "does not propose anything" do - expect(subject).to_not receive(:propose_channels) - subject.proposal - end - end - end - end diff --git a/test/y2network/interface_config_builders/qeth_test.rb b/test/y2network/interface_config_builders/qeth_test.rb index a25fb9036..ebb1460af 100644 --- a/test/y2network/interface_config_builders/qeth_test.rb +++ b/test/y2network/interface_config_builders/qeth_test.rb @@ -32,113 +32,9 @@ res end - let(:executor) { double("Yast::Execute", on_target!: "") } - let(:initialize_channels) { true } - before do - allow(Yast::Execute).to receive(:stdout).and_return(executor) - if initialize_channels - builder.read_channel = "0.0.0800" - builder.write_channel = "0.0.0801" - builder.data_channel = "0.0.0802" - end - end - describe "#type" do it "returns qeth type" do expect(subject.type).to eq Y2Network::InterfaceType::QETH end end - - describe "#configure" do - it "tries to activate the group device associated with the defined device id" do - expect(Yast::Execute).to receive(:on_target!) - .with("/sbin/chzdev", "qeth", builder.device_id, "-e", allowed_exitstatus: 0..255).and_return(0) - subject.configure - end - - context "when activated succesfully" do - it "returns true" do - expect(Yast::Execute).to receive(:on_target!).and_return(0) - expect(subject.configure).to eq(true) - end - end - - context "when failed the activation and returned a non zero return code" do - it "returns false" do - expect(Yast::Execute).to receive(:on_target!).and_return(34) - expect(subject.configure).to eq(false) - end - end - end - - describe "#configured_interface" do - before do - allow(executor).to receive(:on_target!) - .with(["/sbin/lszdev", builder.device_id, "-c", "names", "-n"]) - .and_return("eth1") - end - - it "obtains the network interface associated with builder device id" do - expect(subject.configured_interface).to eq("eth1") - end - end - - describe "#device_id_from" do - context "given the read, write or data device id" do - let(:device_id) { "0.0.0700:0.0.0701:0.0.0702" } - let(:data_channel) { "0.0.0702" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => data_channel }) } - before do - allow(builder).to receive(:hwinfo).and_return(hwinfo) - allow(executor).to receive(:on_target!) - .with(["/sbin/lszdev", "qeth", "-c", "id", "-n"]) - .and_return(device_id) - end - - it "obtains the triplet device ids listed by lszdev" do - expect(subject.device_id_from("0.0.0702")).to eq(device_id) - end - end - end - - describe "#device_id" do - it "returns the channel, write and data device ids joined by ':'" do - expect(subject.device_id).to eql("0.0.0800:0.0.0801:0.0.0802") - end - end - - describe "#propose_channels" do - context "when the read and write channel have not been initialized" do - let(:initialize_channels) { false } - let(:device_id) { "0.0.0800:0.0.0801:0.0802" } - let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } - - before do - allow(builder).to receive(:device_id_from).with(write_channel).and_return(device_id) - allow(builder).to receive(:hwinfo).and_return(hwinfo) - end - - it "initializes them from the given busid" do - expect { builder.propose_channels }.to change { builder.device_id }.from(nil).to(device_id) - end - end - end - - describe "#proposal" do - context "when no device id has been initialized" do - let(:initialize_channels) { false } - it "proposes the channel device ids to be used" do - expect(subject).to receive(:propose_channels) - subject.proposal - end - end - - context "when the channel device ids have been set already" do - it "does not propose anything" do - expect(subject).to_not receive(:propose_channels) - subject.proposal - end - end - end end diff --git a/test/y2network/s390_device_activator_test.rb b/test/y2network/s390_device_activator_test.rb new file mode 100644 index 000000000..ff40e72ac --- /dev/null +++ b/test/y2network/s390_device_activator_test.rb @@ -0,0 +1,54 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../test_helper" + +require "y2network/s390_device_activator" +require "y2network/interface_config_builder" + +describe Y2Network::S390DeviceActivator do + let(:logger) { double(info: true) } + let(:known_builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + let(:unknown_builder) { Y2Network::InterfaceConfigBuilder.for("dummy") } + + describe ".for" do + context "specialized class for given known builder" do + it "returns new instance of that class" do + expect(described_class.for(known_builder).class.to_s).to eq "Y2Network::S390DeviceActivators::Qeth" + end + end + + context "specialized class for given builder does NOT exist" do + before do + allow(described_class).to receive(:log).and_return(logger) + end + + it "returns nil" do + expect(described_class.for(unknown_builder)).to be_nil + end + + it "logs the error" do + expect(logger).to receive(:info).with(/Specialized device activator for dummy not found/) + described_class.for(unknown_builder) + end + end + end +end diff --git a/test/y2network/s390_device_activators/ctc_test.rb b/test/y2network/s390_device_activators/ctc_test.rb new file mode 100644 index 000000000..a68250c7b --- /dev/null +++ b/test/y2network/s390_device_activators/ctc_test.rb @@ -0,0 +1,140 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "y2network/s390_device_activators/ctc" +require "y2network/interface_config_builders/ctc" + +describe Y2Network::S390DeviceActivators::Ctc do + let(:builder) do + res = Y2Network::InterfaceConfigBuilders::Ctc.new + res.name = "ctc0" + res + end + + subject(:activator) { Y2Network::S390DeviceActivators::Ctc.new(builder) } + + let(:executor) { double("Yast::Execute", on_target!: "") } + let(:initialize_channels) { true } + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + builder.read_channel = "0.0.0900" if initialize_channels + builder.write_channel = "0.0.0901" if initialize_channels + builder.protocol = 0 + end + + describe "#configure" do + it "tries to activate the group device associated with the defined device id" do + expect(Yast::Execute).to receive(:on_target!) + .with("/sbin/chzdev", "ctc", subject.device_id, "-e", + "protocol=#{builder.protocol}", allowed_exitstatus: 0..255) + .and_return(0) + subject.configure + end + + context "when activated succesfully" do + it "returns true" do + expect(Yast::Execute).to receive(:on_target!).and_return(0) + expect(subject.configure).to eq(true) + end + end + + context "when failed the activation and returned a non zero return code" do + it "returns false" do + expect(Yast::Execute).to receive(:on_target!).and_return(34) + expect(subject.configure).to eq(false) + end + end + end + + describe "#configured_interface" do + before do + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", activator.device_id, "-c", "names", "-n"]) + .and_return("ctc1") + end + + it "obtains the network interface associated with builder device id" do + expect(subject.configured_interface).to eq("ctc1") + end + end + + describe "#device_id_from" do + context "given the read or write device id" do + let(:device_id) { "0.0.0800:0.0.0801" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + before do + allow(builder).to receive(:hwinfo).and_return(hwinfo) + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", "ctc", "-c", "id", "-n"]) + .and_return(device_id) + end + + it "obtains the triplet device ids listed by lszdev" do + expect(subject.device_id_from(hwinfo.busid)).to eq(device_id) + end + end + end + + describe "#device_id" do + it "returns the read and write channel device ids joined by ':'" do + expect(subject.device_id).to eql("0.0.0900:0.0.0901") + end + end + + describe "#propose_channels" do + context "when the read and write channel have not been initialized" do + let(:initialize_channels) { false } + let(:device_id) { "0.0.0800:0.0.0801" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + + before do + allow(subject).to receive(:device_id_from).with(write_channel).and_return(device_id) + allow(builder).to receive(:hwinfo).and_return(hwinfo) + end + + it "initializes them from the given busid" do + expect { subject.propose_channels }.to change { subject.device_id }.from(nil).to(device_id) + end + end + end + + describe "#proposal" do + context "when no device id has been initialized" do + let(:initialize_channels) { false } + it "proposes the channel device ids to be used" do + expect(subject).to receive(:propose_channels) + subject.proposal + end + end + + context "when the channel device ids have been set already" do + it "does not propose anything" do + expect(subject).to_not receive(:propose_channels) + subject.proposal + end + end + end + +end diff --git a/test/y2network/s390_device_activators/lcs_test.rb b/test/y2network/s390_device_activators/lcs_test.rb new file mode 100644 index 000000000..52e7ab639 --- /dev/null +++ b/test/y2network/s390_device_activators/lcs_test.rb @@ -0,0 +1,68 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "y2network/s390_device_activators/lcs" +require "y2network/interface_config_builders/lcs" + +describe Y2Network::S390DeviceActivators::Lcs do + let(:builder) do + res = Y2Network::InterfaceConfigBuilders::Lcs.new + res.name = "lcs0" + res + end + + subject(:activator) { Y2Network::S390DeviceActivator.for(builder) } + + let(:executor) { double("Yast::Execute", on_target!: "") } + let(:initialize_channels) { true } + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + builder.read_channel = "0.0.0900" if initialize_channels + builder.write_channel = "0.0.0901" if initialize_channels + builder.timeout = 15 + end + + describe "#configure" do + it "tries to activate the group device associated with the defined device id" do + expect(Yast::Execute).to receive(:on_target!) + .with("/sbin/chzdev", "lcs", subject.device_id, "-e", + "lancmd_timeout=15", allowed_exitstatus: 0..255) + .and_return(0) + subject.configure + end + + context "when activated succesfully" do + it "returns true" do + expect(Yast::Execute).to receive(:on_target!).and_return(0) + expect(subject.configure).to eq(true) + end + end + + context "when failed the activation and returned a non zero return code" do + it "returns false" do + expect(Yast::Execute).to receive(:on_target!).and_return(34) + expect(subject.configure).to eq(false) + end + end + end +end diff --git a/test/y2network/s390_device_activators/qeth_test.rb b/test/y2network/s390_device_activators/qeth_test.rb new file mode 100644 index 000000000..49b309f39 --- /dev/null +++ b/test/y2network/s390_device_activators/qeth_test.rb @@ -0,0 +1,141 @@ +#!/usr/bin/env rspec + +# Copyright (c) [2019] SUSE LLC +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as published +# by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, contact SUSE LLC. +# +# To contact SUSE LLC about this file by physical or electronic mail, you may +# find current contact information at www.suse.com. + +require_relative "../../test_helper" + +require "y2network/s390_device_activators/qeth" +require "y2network/interface_config_builders/qeth" + +describe Y2Network::S390DeviceActivators::Qeth do + let(:builder) do + res = Y2Network::InterfaceConfigBuilders::Qeth.new + res.name = "eth0" + res + end + + subject(:activator) { Y2Network::S390DeviceActivator.for(builder) } + + let(:executor) { double("Yast::Execute", on_target!: "") } + let(:initialize_channels) { true } + before do + allow(Yast::Execute).to receive(:stdout).and_return(executor) + if initialize_channels + builder.read_channel = "0.0.0700" + builder.write_channel = "0.0.0701" + builder.data_channel = "0.0.0702" + end + end + + describe "#configure" do + it "tries to activate the group device associated with the defined device id" do + expect(Yast::Execute).to receive(:on_target!) + .with("/sbin/chzdev", "qeth", subject.device_id, "-e", allowed_exitstatus: 0..255) + .and_return(0) + subject.configure + end + + context "when activated succesfully" do + it "returns true" do + expect(Yast::Execute).to receive(:on_target!).and_return(0) + expect(subject.configure).to eq(true) + end + end + + context "when failed the activation and returned a non zero return code" do + it "returns false" do + expect(Yast::Execute).to receive(:on_target!).and_return(34) + expect(subject.configure).to eq(false) + end + end + end + + describe "#configured_interface" do + before do + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", activator.device_id, "-c", "names", "-n"]) + .and_return("eth1") + end + + it "obtains the network interface associated with builder device id" do + expect(subject.configured_interface).to eq("eth1") + end + end + + describe "#device_id_from" do + context "given the read or write device id" do + let(:device_id) { "0.0.0800:0.0.0801:0.0.0802" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + before do + allow(builder).to receive(:hwinfo).and_return(hwinfo) + allow(executor).to receive(:on_target!) + .with(["/sbin/lszdev", "qeth", "-c", "id", "-n"]) + .and_return(device_id) + end + + it "obtains the triplet device ids listed by lszdev" do + expect(subject.device_id_from(hwinfo.busid)).to eq(device_id) + end + end + end + + describe "#device_id" do + it "returns the read and write channel device ids joined by ':'" do + expect(subject.device_id).to eql("0.0.0700:0.0.0701:0.0.0702") + end + end + + describe "#propose_channels" do + context "when the read and write channel have not been initialized" do + let(:initialize_channels) { false } + let(:device_id) { "0.0.0800:0.0.0801:0.0.0802" } + let(:write_channel) { "0.0.0801" } + let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + + before do + allow(subject).to receive(:device_id_from).with(write_channel).and_return(device_id) + allow(builder).to receive(:hwinfo).and_return(hwinfo) + end + + it "initializes them from the given busid" do + expect { subject.propose_channels }.to change { subject.device_id }.from(nil).to(device_id) + end + end + end + + describe "#proposal" do + context "when no device id has been initialized" do + let(:initialize_channels) { false } + it "proposes the channel device ids to be used" do + expect(subject).to receive(:propose_channels) + subject.proposal + end + end + + context "when the channel device ids have been set already" do + it "does not propose anything" do + expect(subject).to_not receive(:propose_channels) + subject.proposal + end + end + end + +end diff --git a/test/y2network/widgets/s390_common_test.rb b/test/y2network/widgets/s390_common_test.rb index dd126c5d5..510afb4e6 100644 --- a/test/y2network/widgets/s390_common_test.rb +++ b/test/y2network/widgets/s390_common_test.rb @@ -30,10 +30,34 @@ end describe Y2Network::Widgets::S390Protocol do - let(:builder) { Y2Network::InterfaceConfigBuilder.for("ctc") } + let(:builder) do + res = Y2Network::InterfaceConfigBuilder.for("ctc") + res.name = "ctc0" + res.protocol = 1 + res + end + subject { described_class.new(builder) } include_examples "CWM::ComboBox" + + describe "#init" do + it "initializes the widget value with the configured protocol" do + expect(subject).to receive(:value=).with("1") + subject.init + end + end + + describe "#store" do + before do + allow(subject).to receive(:value).and_return("4") + end + + it "modifies the builder protocol attribute with the widget value" do + expect { subject.store }.to change { builder.protocol }.from(1).to(4) + end + end + end describe Y2Network::Widgets::S390PortNumber do From 9a596c8e1d3da81bb612a83e2d6dbe31c72210c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 29 Aug 2019 11:02:31 +0100 Subject: [PATCH 439/471] Changes based on code review. --- src/lib/y2network/dialogs/s390_device_activation.rb | 2 ++ src/lib/y2network/s390_device_activator.rb | 9 ++++++++- src/lib/y2network/s390_device_activators/ctc.rb | 3 ++- src/lib/y2network/s390_device_activators/lcs.rb | 7 ++++++- src/lib/y2network/s390_device_activators/qeth.rb | 2 ++ src/lib/y2network/widgets/s390_common.rb | 5 +++-- 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/dialogs/s390_device_activation.rb b/src/lib/y2network/dialogs/s390_device_activation.rb index be091e7ac..cf4b43db7 100644 --- a/src/lib/y2network/dialogs/s390_device_activation.rb +++ b/src/lib/y2network/dialogs/s390_device_activation.rb @@ -31,6 +31,8 @@ class S390DeviceActivation < CWM::Dialog def self.for(builder) return nil unless builder.type case builder.type.short_name + # Both interfaces uses the qeth driver and uses the same configuration + # for activating the group device. when "qeth", "hsi" require "y2network/dialogs/s390_qeth_activation" require "y2network/s390_device_activators/qeth" diff --git a/src/lib/y2network/s390_device_activator.rb b/src/lib/y2network/s390_device_activator.rb index 424336be7..e8e3e8503 100644 --- a/src/lib/y2network/s390_device_activator.rb +++ b/src/lib/y2network/s390_device_activator.rb @@ -21,6 +21,7 @@ require "yast2/execute" module Y2Network + # This class is responsable of activating the supported S390 devices. class S390DeviceActivator extend Forwardable include Yast::Logger @@ -37,6 +38,9 @@ def self.for(builder) nil end + # Constructor + # + # @param [Y2Network::InterfaceConfigBuilder] def initialize(builder) @builder = builder end @@ -46,6 +50,9 @@ def configure_attributes [] end + # Convenience method for obtaining the short name of the builder's type.. + # + # @return string def type builder.type.short_name end @@ -89,7 +96,7 @@ def configured_interface Yast::Execute.stdout.on_target!(cmd).chomp end - # Makes a new proposal + # Makes a new configuration proposal def proposal end end diff --git a/src/lib/y2network/s390_device_activators/ctc.rb b/src/lib/y2network/s390_device_activators/ctc.rb index 59d2c6a83..0737454a1 100644 --- a/src/lib/y2network/s390_device_activators/ctc.rb +++ b/src/lib/y2network/s390_device_activators/ctc.rb @@ -21,6 +21,7 @@ module Y2Network module S390DeviceActivators + # This class is responsible of activating CTC group devices. class Ctc < S390DeviceActivator def_delegators :@builder, :read_channel, :read_channel=, @@ -39,7 +40,7 @@ def configure_attributes ["protocol=#{builder.protocol}"] end - # Modifies the read, write and data channel from the the device id + # Modifies the read and write channel from the the device id def propose_channels id = device_id_from(hwinfo.busid) return unless id diff --git a/src/lib/y2network/s390_device_activators/lcs.rb b/src/lib/y2network/s390_device_activators/lcs.rb index 6af8c2f88..5a8f61655 100644 --- a/src/lib/y2network/s390_device_activators/lcs.rb +++ b/src/lib/y2network/s390_device_activators/lcs.rb @@ -21,7 +21,12 @@ module Y2Network module S390DeviceActivators - # The Lcs device activator is based in Ctc + # The Lcs device activator is based in Ctc as both have two group device + # channels (read and write). + # + # In the past they shared also the configure command 'ctc_configure)' and + # the 'protocol' attribute was needed, but as the configuration has + # been moved to 'chzdev' command it is not the case anymore. class Lcs < Ctc def configure_attributes return [] unless builder.timeout diff --git a/src/lib/y2network/s390_device_activators/qeth.rb b/src/lib/y2network/s390_device_activators/qeth.rb index fd2eaaac6..b20fc5865 100644 --- a/src/lib/y2network/s390_device_activators/qeth.rb +++ b/src/lib/y2network/s390_device_activators/qeth.rb @@ -21,6 +21,8 @@ module Y2Network module S390DeviceActivators + # This class is responsible of activating OSA-Express (QDIO) and + # HiperSockets group devices (qeth driver). class Qeth < S390DeviceActivator def_delegators :@builder, :read_channel, :read_channel=, diff --git a/src/lib/y2network/widgets/s390_common.rb b/src/lib/y2network/widgets/s390_common.rb index ded7f832b..852027629 100644 --- a/src/lib/y2network/widgets/s390_common.rb +++ b/src/lib/y2network/widgets/s390_common.rb @@ -22,7 +22,7 @@ module Y2Network module Widgets - # Widget for setting the s390 device write channel + # Widget for setting the Lcs group device lancmd timeout class S390LanCmdTimeout < CWM::InputField # Constructor # @@ -133,7 +133,8 @@ def store # @see CWM::AbstractWidget def help - _("

    Choose the Port Number for this interface.

    ") + _("

    Choose which physical Port Number on the OSA Adapter " \ + "will be used by this interface. (0 by default)

    ") end end From c921d39ffc698a9d99e75266771cbfc2433a3b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 29 Aug 2019 14:11:13 +0100 Subject: [PATCH 440/471] Fix update of hardware information. --- src/lib/y2network/interface_config_builder.rb | 3 +++ src/lib/y2network/s390_device_activator.rb | 2 +- test/y2network/s390_device_activators/ctc_test.rb | 4 ++-- test/y2network/s390_device_activators/qeth_test.rb | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index e65109548..aff3261f8 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -378,10 +378,13 @@ def configure_as_slave self.aliases = [] end + # @param info [Hash] Hardware information + # @return [Hwinfo] def hwinfo_from(info) @hwinfo = Hwinfo.new(info) end + # @return [Hwinfo] def hwinfo @hwinfo ||= Hwinfo.for(name) end diff --git a/src/lib/y2network/s390_device_activator.rb b/src/lib/y2network/s390_device_activator.rb index e8e3e8503..0169061bb 100644 --- a/src/lib/y2network/s390_device_activator.rb +++ b/src/lib/y2network/s390_device_activator.rb @@ -40,7 +40,7 @@ def self.for(builder) # Constructor # - # @param [Y2Network::InterfaceConfigBuilder] + # @param builder [Y2Network::InterfaceConfigBuilder] def initialize(builder) @builder = builder end diff --git a/test/y2network/s390_device_activators/ctc_test.rb b/test/y2network/s390_device_activators/ctc_test.rb index a68250c7b..124958f49 100644 --- a/test/y2network/s390_device_activators/ctc_test.rb +++ b/test/y2network/s390_device_activators/ctc_test.rb @@ -82,7 +82,7 @@ context "given the read or write device id" do let(:device_id) { "0.0.0800:0.0.0801" } let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + let(:hwinfo) { Y2Network::Hwinfo.new("busid" => write_channel) } before do allow(builder).to receive(:hwinfo).and_return(hwinfo) allow(executor).to receive(:on_target!) @@ -107,7 +107,7 @@ let(:initialize_channels) { false } let(:device_id) { "0.0.0800:0.0.0801" } let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + let(:hwinfo) { Y2Network::Hwinfo.new("busid" => write_channel) } before do allow(subject).to receive(:device_id_from).with(write_channel).and_return(device_id) diff --git a/test/y2network/s390_device_activators/qeth_test.rb b/test/y2network/s390_device_activators/qeth_test.rb index 49b309f39..af532227c 100644 --- a/test/y2network/s390_device_activators/qeth_test.rb +++ b/test/y2network/s390_device_activators/qeth_test.rb @@ -83,7 +83,7 @@ context "given the read or write device id" do let(:device_id) { "0.0.0800:0.0.0801:0.0.0802" } let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + let(:hwinfo) { Y2Network::Hwinfo.new("busid" => write_channel) } before do allow(builder).to receive(:hwinfo).and_return(hwinfo) allow(executor).to receive(:on_target!) @@ -108,7 +108,7 @@ let(:initialize_channels) { false } let(:device_id) { "0.0.0800:0.0.0801:0.0.0802" } let(:write_channel) { "0.0.0801" } - let(:hwinfo) { Y2Network::Hwinfo.new(hwinfo: { "busid" => write_channel }) } + let(:hwinfo) { Y2Network::Hwinfo.new("busid" => write_channel) } before do allow(subject).to receive(:device_id_from).with(write_channel).and_return(device_id) From bb660e05a2a5baa5fb248b32f54256ea8bc9153a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 18 Sep 2019 09:29:07 +0100 Subject: [PATCH 441/471] Add the port number and layer attribute when configuring. --- .../y2network/s390_device_activators/qeth.rb | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/s390_device_activators/qeth.rb b/src/lib/y2network/s390_device_activators/qeth.rb index b20fc5865..6b9bb9a8c 100644 --- a/src/lib/y2network/s390_device_activators/qeth.rb +++ b/src/lib/y2network/s390_device_activators/qeth.rb @@ -28,6 +28,7 @@ class Qeth < S390DeviceActivator :read_channel, :read_channel=, :write_channel, :write_channel=, :data_channel, :data_channel=, + :layer2, :port_number, :hwinfo, :attributes def device_id @@ -40,7 +41,7 @@ def device_id def configure_attributes return [] unless attributes - attributes.split(" ") + attributes.split(" ").concat([layer2_attribute, port_ttribute]) end # Modifies the read, write and data channel from the the device id @@ -54,5 +55,23 @@ def proposal propose_channels unless device_id end end + + private + + # Convenience method to obtain the layer2 attribute + # + # @return [String] + def layer2_attribute + return "" unless layer2 + + "layer2=#{layer2 ? 1 : 0}" + end + + # Convenience method to obtain the port number attribute + # + # @return [String] + def port_attribute + "port_number=#{port_number}" + end end end From 1049e5fb7657646d5b19bc0f9c160e55b02de3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 18 Sep 2019 10:30:11 +0100 Subject: [PATCH 442/471] Validate mac address when layer2 is enabled. --- src/lib/y2network/widgets/s390_common.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/lib/y2network/widgets/s390_common.rb b/src/lib/y2network/widgets/s390_common.rb index 852027629..935e259d6 100644 --- a/src/lib/y2network/widgets/s390_common.rb +++ b/src/lib/y2network/widgets/s390_common.rb @@ -244,8 +244,30 @@ def handle(event) nil end + def validate + return true if !layer2? || valid_mac?(mac_address_widget.value) + + report_mac_error && false + end + private + def report_mac_error + # TRANSLATORS: Popup error about not valid MAC address provided + msg = _("The MAC address provided is not valid, please provide a valid one.") + Yast::Popup.Error(msg) + end + + def layer2? + !!support_widget.value + end + + def valid_mac?(mac_address) + return false if mac_address.to_s.empty? + return false if mac_address == "00:00:00:00:00:00" + !!(mac_address =~ /^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/i) + end + def refresh support_widget.checked? ? mac_address_widget.enable : mac_address_widget.disable end From f0532e966e71b0ea4e8f4c0cac9cfb0a43bba42a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 18 Sep 2019 13:17:40 +0100 Subject: [PATCH 443/471] Added tests for QETH layer2 support widgets --- src/lib/y2network/widgets/s390_common.rb | 15 +++- test/y2network/widgets/s390_common_test.rb | 84 ++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/s390_common.rb b/src/lib/y2network/widgets/s390_common.rb index 935e259d6..8944c801f 100644 --- a/src/lib/y2network/widgets/s390_common.rb +++ b/src/lib/y2network/widgets/s390_common.rb @@ -247,7 +247,8 @@ def handle(event) def validate return true if !layer2? || valid_mac?(mac_address_widget.value) - report_mac_error && false + report_mac_error + false end private @@ -258,24 +259,36 @@ def report_mac_error Yast::Popup.Error(msg) end + # Convenience method to check whether layer2 support is enabled or not + # + # @return [Boolean] true if enabled; false otherwise def layer2? !!support_widget.value end + # Convenience method to check whether the MAC address provided is valid + # or not + # + # @return [Boolean] true when valid; false otherwise + # @param mac_address [String] def valid_mac?(mac_address) return false if mac_address.to_s.empty? return false if mac_address == "00:00:00:00:00:00" !!(mac_address =~ /^([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}$/i) end + # Convenience method to enable or disable the mac address widget when the + # layer2 support is modified def refresh support_widget.checked? ? mac_address_widget.enable : mac_address_widget.disable end + # @return [S390Layer2Support] def support_widget @support_widget ||= S390Layer2Support.new(@settings) end + # @return [S390Layer2Address] def mac_address_widget @mac_address_widget ||= S390Layer2Address.new(@settings) end diff --git a/test/y2network/widgets/s390_common_test.rb b/test/y2network/widgets/s390_common_test.rb index 510afb4e6..0c957b220 100644 --- a/test/y2network/widgets/s390_common_test.rb +++ b/test/y2network/widgets/s390_common_test.rb @@ -73,3 +73,87 @@ include_examples "CWM::InputField" end + +describe Y2Network::Widgets::S390Layer2 do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + let(:layer2_support) { true } + let(:layer2_address) { "00:00:00:00:00:00" } + let(:layer2_support_widget) do + instance_double("Y2Network::WidgetsS390Layer2Support", + value: layer2_support, widget_id: "layer2_support") + end + + let(:layer2_address_widget) do + instance_double("Y2Network::WidgetsS390Layer2Address", + value: layer2_address, widget_id: "layer2_address") + end + + subject { described_class.new(builder) } + + before do + allow(subject).to receive(:support_widget).and_return(layer2_support_widget) + allow(subject).to receive(:mac_address_widget).and_return(layer2_address_widget) + end + + include_examples "CWM::CustomWidget" + + describe "#handle" do + context "when the event handled is for the layer2_support widget" do + it "refresh the mac address widget" do + expect(subject).to receive(:refresh) + subject.handle("ID" => "layer2_support") + end + end + + it "returns nil" do + allow(subject).to receive(:refresh) + expect(subject.handle("ID" => "layer2_address")).to be_nil + expect(subject.handle("ID" => "layer2_support")).to be_nil + end + end + + describe "#validate" do + context "when the layer2 support is not enabled" do + let(:layer2_support) { false } + it "returns true" do + expect(subject.validate).to eql(true) + end + end + + context "when the layer2 support is enabled" do + context "and the MAC provided is valid" do + let(:layer2_address) { "02:00:00:00:01:FD" } + + it "returns true" do + expect(subject.validate).to eql(true) + end + end + + context "and the MAC address provided is invalid" do + it "returns false" do + allow(Yast::Popup).to receive(:Error) + expect(subject.validate).to eql(false) + end + + it "reports an error" do + expect(Yast::Popup).to receive(:Error).with(/MAC address provided is not valid/) + expect(subject.validate).to eql(false) + end + end + end + end +end + +describe Y2Network::Widgets::S390Layer2Support do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + subject { described_class.new(builder) } + + include_examples "CWM::CheckBox" +end + +describe Y2Network::Widgets::S390Layer2Address do + let(:builder) { Y2Network::InterfaceConfigBuilder.for("qeth") } + subject { described_class.new(builder) } + + include_examples "CWM::InputField" +end From ef57de8acdacd5c1fbfd62e41063b2b8fc8108ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Wed, 18 Sep 2019 14:47:58 +0100 Subject: [PATCH 444/471] Compare also the QETH extra attributes changes --- src/lib/y2network/connection_config/qeth.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/qeth.rb b/src/lib/y2network/connection_config/qeth.rb index c4b698f24..7e5a09001 100644 --- a/src/lib/y2network/connection_config/qeth.rb +++ b/src/lib/y2network/connection_config/qeth.rb @@ -65,7 +65,8 @@ def initialize def ==(other) return false unless super - [:read_channel, :write_channel, :data_channel, :layer2, :port_number].all? do |method| + [:read_channel, :write_channel, :data_channel, + :layer2, :port_number, :attributes].all? do |method| public_send(method) == other.public_send(method) end end From 85503d660f0a0ea32c1bddd7f17a81bd00567240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Thu, 19 Sep 2019 09:04:36 +0100 Subject: [PATCH 445/471] Changes based on code review. --- src/lib/y2network/connection_config/qeth.rb | 4 +- .../y2network/dialogs/s390_ctc_activation.rb | 2 + .../dialogs/s390_device_activation.rb | 4 +- src/lib/y2network/interfaces_collection.rb | 2 +- src/lib/y2network/s390_device_activator.rb | 34 ++++++---- .../y2network/s390_device_activators/ctc.rb | 2 +- .../y2network/s390_device_activators/lcs.rb | 2 +- .../y2network/s390_device_activators/qeth.rb | 62 +++++++++++++------ src/lib/y2network/sysconfig/config_writer.rb | 2 + .../dialogs/s390_device_activation_test.rb | 2 +- .../s390_device_activators/ctc_test.rb | 6 +- .../s390_device_activators/qeth_test.rb | 10 +-- 12 files changed, 86 insertions(+), 46 deletions(-) diff --git a/src/lib/y2network/connection_config/qeth.rb b/src/lib/y2network/connection_config/qeth.rb index 7e5a09001..eae90618d 100644 --- a/src/lib/y2network/connection_config/qeth.rb +++ b/src/lib/y2network/connection_config/qeth.rb @@ -65,8 +65,8 @@ def initialize def ==(other) return false unless super - [:read_channel, :write_channel, :data_channel, - :layer2, :port_number, :attributes].all? do |method| + [:read_channel, :write_channel, :data_channel, :layer2, + :port_number, :ipa_takeover, :attributes].all? do |method| public_send(method) == other.public_send(method) end end diff --git a/src/lib/y2network/dialogs/s390_ctc_activation.rb b/src/lib/y2network/dialogs/s390_ctc_activation.rb index 50a337b44..36a2cc15d 100644 --- a/src/lib/y2network/dialogs/s390_ctc_activation.rb +++ b/src/lib/y2network/dialogs/s390_ctc_activation.rb @@ -24,6 +24,8 @@ module Dialogs # Dialog for activating a CTC device class S390CtcActivation < S390DeviceActivation def contents + # Already defined in the base class but added here just because of the + # pot check textdomain "network" HBox( diff --git a/src/lib/y2network/dialogs/s390_device_activation.rb b/src/lib/y2network/dialogs/s390_device_activation.rb index cf4b43db7..85dd6c0cd 100644 --- a/src/lib/y2network/dialogs/s390_device_activation.rb +++ b/src/lib/y2network/dialogs/s390_device_activation.rb @@ -61,7 +61,7 @@ def initialize(activator) textdomain "network" @activator = activator - @activator.proposal + @activator.propose! @builder = activator.builder end @@ -79,7 +79,7 @@ def run configured = activator.configure builder.name = activator.configured_interface if configured # TODO: Refresh the list of interfaces in yast_config. Take into - # account that the interface in yast_config does not have a nem so + # account that the interface in yast_config does not have a name so # the builder.interface is probably nil and should be obtained # through the busid. if !configured || builder.name.empty? diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index f9cbb6859..eb65c6ecb 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -74,7 +74,7 @@ def by_name(name) # @return [Interface,nil] Interface with the given busid or nil if not found def by_busid(busid) interfaces.find do |iface| - iface.hardware.busid == busid + iface.hardware && iface.hardware.busid == busid end end diff --git a/src/lib/y2network/s390_device_activator.rb b/src/lib/y2network/s390_device_activator.rb index 0169061bb..03996db3c 100644 --- a/src/lib/y2network/s390_device_activator.rb +++ b/src/lib/y2network/s390_device_activator.rb @@ -26,6 +26,13 @@ class S390DeviceActivator extend Forwardable include Yast::Logger + # Command for configuring z Systems specific devices + CONFIGURE_CMD = "/sbin/chzdev".freeze + # Command for displaying configuration of z Systems specific devices + LIST_CMD = "/sbin/lszdev".freeze + + def_delegators :@builder, :type + attr_accessor :builder # Load fresh instace of device activator for given interface config builder @@ -45,18 +52,23 @@ def initialize(builder) @builder = builder end + # Each s390 device type permits a set of attributes to be passed as extra + # options to the configuration command. This method return a list of each + # option in the form "attribute=value" + # + # @example qeth options + # @activator.configure_attributes + # #=> ["bridge_role=primary", "layer2=1", "portno=0", "ipa_takeover/enable=1"] + # + # @example ctc options + # @activator.configure_attributes + # #=> ["protocol=1"] + # # @return [Array] def configure_attributes [] end - # Convenience method for obtaining the short name of the builder's type.. - # - # @return string - def type - builder.type.short_name - end - # The device id to be used by lszdev or chzdev commands # # @return [String, nil] @@ -69,7 +81,7 @@ def device_id # @param channel [String] # @return [String] def device_id_from(channel) - cmd = "/sbin/lszdev #{type} -c id -n".split(" ") + cmd = [LIST_CMD, type.short_name, "-c", "id", "-n"] Yast::Execute.stdout.on_target!(cmd).split("\n").find do |d| d.include? channel @@ -81,7 +93,7 @@ def device_id_from(channel) # @return [Boolean] true when enabled def configure return false unless device_id - cmd = "/sbin/chzdev #{type} #{device_id} -e".split(" ").concat(configure_attributes) + cmd = [CONFIGURE_CMD, type.short_name, device_id, "-e"].concat(configure_attributes) Yast::Execute.on_target!(*cmd, allowed_exitstatus: 0..255).zero? end @@ -91,13 +103,13 @@ def configure # @return [String] device name def configured_interface return "" unless device_id - cmd = "/sbin/lszdev #{device_id} -c names -n".split(" ") + cmd = [LIST_CMD, device_id, "-c", "names", "-n"] Yast::Execute.stdout.on_target!(cmd).chomp end # Makes a new configuration proposal - def proposal + def propose! end end end diff --git a/src/lib/y2network/s390_device_activators/ctc.rb b/src/lib/y2network/s390_device_activators/ctc.rb index 0737454a1..6c3c771ec 100644 --- a/src/lib/y2network/s390_device_activators/ctc.rb +++ b/src/lib/y2network/s390_device_activators/ctc.rb @@ -47,7 +47,7 @@ def propose_channels self.read_channel, self.write_channel = id.split(":") end - def proposal + def propose! propose_channels unless device_id end end diff --git a/src/lib/y2network/s390_device_activators/lcs.rb b/src/lib/y2network/s390_device_activators/lcs.rb index 5a8f61655..14097cdaa 100644 --- a/src/lib/y2network/s390_device_activators/lcs.rb +++ b/src/lib/y2network/s390_device_activators/lcs.rb @@ -24,7 +24,7 @@ module S390DeviceActivators # The Lcs device activator is based in Ctc as both have two group device # channels (read and write). # - # In the past they shared also the configure command 'ctc_configure)' and + # In the past they shared also the configure command 'ctc_configure' and # the 'protocol' attribute was needed, but as the configuration has # been moved to 'chzdev' command it is not the case anymore. class Lcs < Ctc diff --git a/src/lib/y2network/s390_device_activators/qeth.rb b/src/lib/y2network/s390_device_activators/qeth.rb index 6b9bb9a8c..fc6198a43 100644 --- a/src/lib/y2network/s390_device_activators/qeth.rb +++ b/src/lib/y2network/s390_device_activators/qeth.rb @@ -28,7 +28,7 @@ class Qeth < S390DeviceActivator :read_channel, :read_channel=, :write_channel, :write_channel=, :data_channel, :data_channel=, - :layer2, :port_number, + :layer2, :port_number, :ipa_takeover, :hwinfo, :attributes def device_id @@ -37,11 +37,25 @@ def device_id [read_channel, write_channel, data_channel].join(":") end - # @return [Array] + # Return a list of the options to be set when activating the device. The + # list is composed by the attributes configured and the attributes that + # have their own variable (layer2, port_number and ipa_takeover). + # + # @example Qeth configuration + # activator.layer2 #=> true + # activator.port_number #=> 1 + # activator.ipa_takeover #=> true + # activator.attributes #=> "bridge_role=secondary" + # activator.configure_attributes #=> ["bridge_role=secondary", + # "ipa_takeover/enable=1", "layer2=1", "portno=1"] + # + # @see [S390DeviceActivator#configure_attributes] def configure_attributes - return [] unless attributes - - attributes.split(" ").concat([layer2_attribute, port_ttribute]) + extra_attributes = [] + extra_attributes.concat(attributes.split(" ")) if attributes + extra_attributes << ipa_takeover_attribute unless ipa_takeover.nil? + extra_attributes << layer2_attribute unless layer2.nil? + extra_attributes << port_attribute end # Modifies the read, write and data channel from the the device id @@ -51,27 +65,35 @@ def propose_channels self.read_channel, self.write_channel, self.data_channel = id.split(":") end - def proposal + def propose! propose_channels unless device_id end - end - private + private - # Convenience method to obtain the layer2 attribute - # - # @return [String] - def layer2_attribute - return "" unless layer2 + # Convenience method to obtain the layer2 attribute for the configuration + # command + # + # @return [String] + def layer2_attribute + "layer2=#{layer2 ? 1 : 0}" + end - "layer2=#{layer2 ? 1 : 0}" - end + # Convenience method to obtain the port number attribute for the + # configuration command + # + # @return [String] + def port_attribute + "portno=#{port_number}" + end - # Convenience method to obtain the port number attribute - # - # @return [String] - def port_attribute - "port_number=#{port_number}" + # Convenience method to obtain the port number attribute for the + # configuration command + # + # @return [String] + def ipa_takeover_attribute + "ipa_takeover/enable=#{ipa_takeover ? 1 : 0}" + end end end end diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index fc28530c7..25ce377d7 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -67,6 +67,8 @@ def write(config, old_config = nil) def write_interface_changes(config, old_config) # Write ifroute files config.interfaces.each do |dev| + # S390 devices that have not been activated yet will be part of the + # collection but with an empty name. next if dev.name.empty? routes = find_routes_for(dev, config.routing.routes) file = routes_file_for(dev) diff --git a/test/y2network/dialogs/s390_device_activation_test.rb b/test/y2network/dialogs/s390_device_activation_test.rb index aeef33770..4db495ba9 100644 --- a/test/y2network/dialogs/s390_device_activation_test.rb +++ b/test/y2network/dialogs/s390_device_activation_test.rb @@ -33,7 +33,7 @@ describe ".new" do it "creates a proposal for the configured device" do - expect(activator).to receive(:proposal) + expect(activator).to receive(:propose!) described_class.new(activator) end end diff --git a/test/y2network/s390_device_activators/ctc_test.rb b/test/y2network/s390_device_activators/ctc_test.rb index 124958f49..0dda0f382 100644 --- a/test/y2network/s390_device_activators/ctc_test.rb +++ b/test/y2network/s390_device_activators/ctc_test.rb @@ -120,19 +120,19 @@ end end - describe "#proposal" do + describe "#propose!" do context "when no device id has been initialized" do let(:initialize_channels) { false } it "proposes the channel device ids to be used" do expect(subject).to receive(:propose_channels) - subject.proposal + subject.propose! end end context "when the channel device ids have been set already" do it "does not propose anything" do expect(subject).to_not receive(:propose_channels) - subject.proposal + subject.propose! end end end diff --git a/test/y2network/s390_device_activators/qeth_test.rb b/test/y2network/s390_device_activators/qeth_test.rb index af532227c..5720f3446 100644 --- a/test/y2network/s390_device_activators/qeth_test.rb +++ b/test/y2network/s390_device_activators/qeth_test.rb @@ -47,7 +47,9 @@ describe "#configure" do it "tries to activate the group device associated with the defined device id" do expect(Yast::Execute).to receive(:on_target!) - .with("/sbin/chzdev", "qeth", subject.device_id, "-e", allowed_exitstatus: 0..255) + .with("/sbin/chzdev", "qeth", subject.device_id, "-e", + "ipa_takeover/enable=0", "layer2=0", "portno=0", + allowed_exitstatus: 0..255) .and_return(0) subject.configure end @@ -121,19 +123,19 @@ end end - describe "#proposal" do + describe "#propose!" do context "when no device id has been initialized" do let(:initialize_channels) { false } it "proposes the channel device ids to be used" do expect(subject).to receive(:propose_channels) - subject.proposal + subject.propose! end end context "when the channel device ids have been set already" do it "does not propose anything" do expect(subject).to_not receive(:propose_channels) - subject.proposal + subject.propose! end end end From f83e2693db92986289f7ac294e62aac5a1920e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 16:15:21 +0100 Subject: [PATCH 446/471] Drop LanItems.Read method --- src/modules/Lan.rb | 29 +++++++++++++------------- src/modules/LanItems.rb | 16 -------------- test/bridge_test.rb | 2 +- test/network_autoconfiguration_test.rb | 1 - 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 0682d07bc..4a69a80d7 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -265,10 +265,6 @@ def Read(cache) return true end - system_config = Y2Network::Config.from(:sysconfig) - add_config(:system, system_config) - add_config(:yast, system_config.copy) - # Read dialog caption caption = _("Initializing Network Configuration") @@ -334,7 +330,7 @@ def Read(cache) return false if Abort() ProgressNextStage(_("Reading device configuration...")) if @gui - LanItems.Read + read_config Builtins.sleep(sl) @@ -1041,16 +1037,21 @@ def connected_and_bridgeable?(bridge_builder, interface) true end + # Refreshes YaST network configuration + # + # It does not modified the system configuration that was already read. def refresh_lan_items - LanItems.force_restart = true - # re-read configuration to see new items in UI - LanItems.Read - - # note: LanItems.Read resets modification flag - # the Read is used as a trick how to update LanItems' internal - # cache according NetworkInterfaces' one. As NetworkInterfaces' - # cache was edited directly, LanItems is not aware of changes. - LanItems.SetModified + yast_config = Y2Network::Config.from(:sysconfig) + Yast::Lan.add_config(:yast, yast_config) + end + + # Reads system configuration + # + # It clears already read configuration. + def read_config + system_config = Y2Network::Config.from(:sysconfig) + Yast::Lan.add_config(:system, system_config) + Yast::Lan.add_config(:yast, system_config.copy) end # Returns the routing summary diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index bcba086ee..7254e3da1 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -457,22 +457,6 @@ def ReadHw nil end - # initializates @Items - # - # It does: - # (1) read hardware present on the system - # (2) read known configurations (e.g. ifcfg-eth0) - # (3) joins together. Join is done via device name (e.g. eth0) as key. - # It is full outer join in -> you can have hwinfo part with no coresponding - # netconfig part (or vice versa) in @Items when the method is done. - def Read - reset_cache - - system_config = Y2Network::Config.from(:sysconfig) - Yast::Lan.add_config(:system, system_config) - Yast::Lan.add_config(:yast, system_config.copy) - end - # Clears internal cache of the module to default values # # TODO: LanItems consists of several sets of internal variables. diff --git a/test/bridge_test.rb b/test/bridge_test.rb index f8a8c9e1f..8eb500bd1 100755 --- a/test/bridge_test.rb +++ b/test/bridge_test.rb @@ -27,6 +27,7 @@ require "y2network/interface" require "y2network/type_detector" +Yast.import "Lan" Yast.import "LanItems" describe Yast::LanItems do @@ -119,7 +120,6 @@ .to receive(:type_of) .with(/eth[0-9]/) .and_return(Y2Network::InterfaceType::ETHERNET) - Yast::LanItems.Read end describe "#GetBridgeableInterfaces" do diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index b70bec15e..3cd569cfe 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -201,7 +201,6 @@ def probe_netcard_factory(num) allow(Y2Network::Config).to receive(:find).with(:yast).and_return(yast_config) allow(Y2Network::Config).to receive(:find).with(:system).and_return(system_config) allow(instance).to receive(:virtual_proposal_required?).and_return(proposal) - allow(Yast::LanItems).to receive(:Read) allow(yast_config).to receive(:write) allow(Yast::Lan).to receive(:connected_and_bridgeable?).and_return(true) allow(Yast::PackageSystem).to receive(:Installed).and_return(true) From f1589da3797bc5012c6e0ae217828f729859c02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Wed, 18 Sep 2019 16:15:41 +0100 Subject: [PATCH 447/471] Drop a bunch of unused LanItems methods --- src/modules/LanItems.rb | 265 --------------------------------- test/lan_items_helpers_test.rb | 15 -- test/netcard_test.rb | 56 ------- 3 files changed, 336 deletions(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 7254e3da1..9b90f0003 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -33,20 +33,6 @@ require "shellwords" module Yast - # Does way too many things. - # - # 1. Aggregates data about network interfaces, both configured - # and unconfigured, in {#Items}, which see. - # - # 2. Provides direct access to individual items of ifcfg files. - # For example BOOTPROTO and STARTMODE are accessible in - # {#bootproto} and {#startmode} (set via {#SetDeviceVars} - # via {#Select} or {#SetItem}). The reverse direction (putting - # the individual values back to an item) is {#Commit}. - # - # 3. ... - # - # FIXME: well this class really is not nice class LanItemsClass < Module include Logger @@ -268,30 +254,6 @@ def SetModified nil end - def AddNew - @current = @Items.to_h.size - # Items[@current] is expected to always exist - @Items[@current] = {} - @operation = :add - - nil - end - - # return list of available modules for current device - # with default default_module (on first possition) - - def GetItemModules(default_module) - mods = [] - mods = Builtins.add(mods, default_module) if IsNotEmpty(default_module) - Builtins.foreach( - Ops.get_list(@Items, [@current, "hwinfo", "drivers"], []) - ) do |row| - tmp_mod = Ops.get_string(row, ["modules", 0, 0], "") - mods = Builtins.add(mods, tmp_mod) if !Builtins.contains(mods, tmp_mod) - end - deep_copy(mods) - end - # Creates list of all known netcard items # # It means list of item ids of all netcards which are detected and/or @@ -395,29 +357,6 @@ def FindAndSelect(device) !item_id.nil? end - # search all known devices to find it's index in Items array - # - # @param [String] device matched with item[ "hwinfo", "dev_name"] - # @return index in Items or -1 if not found - def FindDeviceIndex(device) - ret = -1 - - Builtins.foreach( - Convert.convert( - @Items, - from: "map ", - to: "map >" - ) - ) do |i, a| - if Ops.get_string(a, ["hwinfo", "dev_name"], "") == device - ret = i - raise Break - end - end - - ret - end - # It finds a new style device name for device name in old fashioned format # # It goes through currently present devices and tries to mach it to given @@ -498,39 +437,6 @@ def Import(settings) true end - def GetDescr - descr = [] - Builtins.foreach( - Convert.convert( - @Items, - from: "map ", - to: "map >" - ) - ) do |key, value| - if Builtins.haskey(value, "table_descr") && - Ops.greater_than( - Builtins.size(Ops.get_map(@Items, [key, "table_descr"], {})), - 1 - ) - descr = Builtins.add( - descr, - "id" => key, - "rich_descr" => Ops.get_string( - @Items, - [key, "table_descr", "rich_descr"], - "" - ), - "table_descr" => Ops.get_list( - @Items, - [key, "table_descr", "table_descr"], - [] - ) - ) - end - end - deep_copy(descr) - end - def needFirmwareCurrentItem need = false if IsNotEmpty(Ops.get_string(@Items, [@current, "hwinfo", "driver"], "")) @@ -709,98 +615,6 @@ def dhcp?(devmap) Y2Network::BootProtocol.from_name(devmap["BOOTPROTO"]).dhcp? end - def GetItemDescription - Ops.get_string(@Items, [@current, "table_descr", "rich_descr"], "") - end - - # Select the hardware component - # @param hardware the component - def SelectHWMap(hardware) - hardware = deep_copy(hardware) - sel = SelectHardwareMap(hardware) - - # common stuff - @description = Ops.get_string(sel, "name", "") - @type = Ops.get_string(sel, "type", "eth") - @hotplug = Ops.get_string(sel, "hotplug", "") - - @Requires = Ops.get_list(sel, "requires", []) - # #44977: Requires now contain the appropriate kernel packages - # but they are handled differently due to multiple kernel flavors - # (see Package::InstallKernel) - # Leave only those not starting with "kernel". - @Requires = Builtins.filter(@Requires) do |r| - Builtins.search(r, "kernel") != 0 - end - Builtins.y2milestone("requires=%1", @Requires) - - # FIXME: devname - @hotplug = "" - - Builtins.y2milestone("hw=%1", hardware) - - @hw = deep_copy(hardware) - if Arch.s390 && @operation == :add - Builtins.y2internal("Propose chan_ids values for %1", @hw) - devid = 0 - devstr = "" - s390chanid = "[0-9]+\\.[0-9]+\\." - if Builtins.regexpmatch(Ops.get_string(@hw, "busid", ""), s390chanid) - devid = Builtins.tointeger( - Ops.add( - "0x", - Builtins.regexpsub( - Ops.get_string(@hw, "busid", ""), - Ops.add(s390chanid, "(.*)"), - "\\1" - ) - ) - ) - devstr = Builtins.regexpsub( - Ops.get_string(@hw, "busid", ""), - Ops.add(Ops.add("(", s390chanid), ").*"), - "\\1" - ) - end - - Builtins.y2milestone("devid=%1(%2)", devid, devstr) - devid = 0 if devid.nil? - devid0 = String.PadZeros( - Builtins.regexpsub(Builtins.tohexstring(devid), "0x(.*)", "\\1"), - 4 - ) - devid1 = String.PadZeros( - Builtins.regexpsub( - Builtins.tohexstring(Ops.add(devid, 1)), - "0x(.*)", - "\\1" - ), - 4 - ) - devid2 = String.PadZeros( - Builtins.regexpsub( - Builtins.tohexstring(Ops.add(devid, 2)), - "0x(.*)", - "\\1" - ), - 4 - ) - @qeth_chanids = if DriverType(@type) == "ctc" || DriverType(@type) == "lcs" - Builtins.sformat("%1%2 %1%3", devstr, devid0, devid1) - else - Builtins.sformat( - "%1%2 %1%3 %1%4", - devstr, - devid0, - devid1, - devid2 - ) - end - end - - nil - end - #------------------- # PRIVATE FUNCTIONS @@ -849,44 +663,6 @@ def Rollback true end - # Deletes item and its configuration - # - # Item for deletion is searched using device name - def delete_dev(name) - FindAndSelect(name) - DeleteItem() - end - - # Deletes the {#current} item and its configuration - def DeleteItem - return if @current < 0 - return if @Items.nil? || @Items.empty? - - log.info("DeleteItem: #{@Items[@current]}") - - devmap = GetCurrentMap() - drop_hosts(devmap["IPADDR"]) if devmap - # We have to remove it from routing before deleting the item - remove_current_device_from_routing - - current_item = @Items[@current] - - if current_item["hwinfo"].nil? || current_item["hwinfo"].empty? - # size is always > 0 here and items are numbered 0, 1, ..., size -1 - delete_index = @Items.size - 1 - - @Items[@current] = @Items[delete_index] if delete_index != @current - @Items.delete(delete_index) - - # item was deleted, so original @current is invalid - @current = -1 - end - - SetModified() - - nil - end - def SetItem(*) @hotplug = "" Builtins.y2debug("type=%1", @type) @@ -898,35 +674,6 @@ def SetItem(*) nil end - def setDriver(driver) - Builtins.y2milestone( - "driver %1, %2", - driver, - Ops.get_string(getCurrentItem, ["hwinfo", "module"], "") - ) - if Ops.get_string(getCurrentItem, ["hwinfo", "module"], "") == driver && - IsEmpty(Ops.get_string(getCurrentItem, ["udev", "driver"], "")) - return - end - Ops.set(@Items, [@current, "udev", "driver"], driver) - - nil - end - - def enableCurrentEditButton - return true if needFirmwareCurrentItem - return true if Arch.s390 - if IsEmpty(Ops.get_string(getCurrentItem, ["hwinfo", "dev_name"], "")) && - Ops.greater_than( - Builtins.size(Ops.get_map(getCurrentItem, "hwinfo", {})), - 0 - ) - return false - else - return true - end - end - # Creates eth emulation for s390 devices # # @param dev_attrs [Hash] an s390 device description (e.g. as obtained from AY profile). @@ -1394,26 +1141,14 @@ def yast_config publish function: :GetDeviceMap, type: "map (integer)" publish function: :GetModified, type: "boolean ()" publish function: :SetModified, type: "void ()" - publish function: :AddNew, type: "void ()" - publish function: :GetItemModules, type: "list (string)" - publish function: :GetNetcardNames, type: "list ( list )" publish function: :FindAndSelect, type: "boolean (string)" - publish function: :FindDeviceIndex, type: "integer (string)" publish function: :ReadHw, type: "void ()" publish function: :Read, type: "void ()" publish function: :needFirmwareCurrentItem, type: "boolean ()" - publish function: :GetFirmwareForCurrentItem, type: "string ()" - publish function: :GetBondSlaves, type: "list (string)" publish function: :isCurrentHotplug, type: "boolean ()" publish function: :isCurrentDHCP, type: "boolean ()" - publish function: :GetItemDescription, type: "string ()" - publish function: :SelectHWMap, type: "void (map)" - publish function: :SetDeviceVars, type: "void (map, map)" - publish function: :Select, type: "boolean (string)" publish function: :Commit, type: "boolean ()" publish function: :Rollback, type: "boolean ()" - publish function: :setDriver, type: "void (string)" - publish function: :enableCurrentEditButton, type: "boolean ()" publish function: :createS390Device, type: "boolean ()" publish function: :find_dhcp_ifaces, type: "list ()" end diff --git a/test/lan_items_helpers_test.rb b/test/lan_items_helpers_test.rb index 5648e7809..d62a2b2ea 100755 --- a/test/lan_items_helpers_test.rb +++ b/test/lan_items_helpers_test.rb @@ -50,21 +50,6 @@ end end -describe "LanItemsClass#delete_dev" do - before(:each) do - Yast::LanItems.Items = { - 0 => { - "ifcfg" => "enp0s3" - } - } - end - - it "removes device config when found" do - Yast::LanItems.delete_dev("enp0s3") - expect(Yast::LanItems.Items).to be_empty - end -end - describe "LanItemsClass#getNetworkInterfaces" do NETCONFIG_ITEMS = { "eth" => { diff --git a/test/netcard_test.rb b/test/netcard_test.rb index 2711d7a14..5cb57f3f9 100755 --- a/test/netcard_test.rb +++ b/test/netcard_test.rb @@ -91,27 +91,6 @@ Yast.import "LanItems" -describe "When querying netcard device name" do - before(:each) do - @lan_items = Yast::LanItems - @lan_items.main - - # mocking only neccessary parts of Yast::LanItems so we need not to call - # and mock inputs for Yast::LanItems.Read here - @lan_items.Items = Yast.deep_copy(MOCKED_ITEMS) - end - - it "returns empty list when querying device name with nil or empty input" do - [nil, []].each { |i| expect(@lan_items.GetDeviceNames(i)).to be_empty } - end - - it "can return list of device names available in the system" do - expected_names = ["bond0", "br0", "eth1", "eth11", "enp0s3", "tap0", "tun0"].sort - - expect(@lan_items.GetNetcardNames.sort).to eq expected_names - end -end - class NetworkComplexIncludeClass < Yast::Module def initialize Yast.include self, "network/complex.rb" @@ -157,41 +136,6 @@ def initialize end end -describe "LanItemsClass#DeleteItem" do - before(:each) do - @lan_items = Yast::LanItems - @lan_items.main - @lan_items.Items = Yast.deep_copy(MOCKED_ITEMS) - end - - it "removes an existing item" do - before_items = nil - - while before_items != @lan_items.Items && !@lan_items.Items.empty? - @lan_items.current = 0 - - item_name = @lan_items.GetCurrentName - before_items = @lan_items.Items - - @lan_items.DeleteItem - - expect(@lan_items.FindAndSelect(item_name)).to be false - end - end - - xit "removes only the configuration if the item has hwinfo" do - before_size = @lan_items.Items.size - item_name = "enp0s3" - - expect(@lan_items.FindAndSelect(item_name)).to be true - - @lan_items.DeleteItem - - expect(@lan_items.FindAndSelect(item_name)).to be false - expect(@lan_items.Items.size).to eql before_size - end -end - describe "LanItemsClass#GetItemName" do before(:each) do @lan_items = Yast::LanItems From 83f0b466a2ae76248adaf6b3ac205ec69060d442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 09:07:55 +0100 Subject: [PATCH 448/471] Replace LanItems.{GetModified,SetModified} with Lan counterparts --- src/clients/lan_auto.rb | 4 +- src/include/network/widgets.rb | 2 +- src/modules/Lan.rb | 11 ++++- test/lan_auto_test.rb | 8 +-- test/lan_test.rb | 89 ++++++++++++++++++---------------- test/test_helper.rb | 1 - 6 files changed, 64 insertions(+), 51 deletions(-) diff --git a/src/clients/lan_auto.rb b/src/clients/lan_auto.rb index 0798498ef..e406e29cd 100644 --- a/src/clients/lan_auto.rb +++ b/src/clients/lan_auto.rb @@ -86,9 +86,9 @@ def main elsif @func == "Packages" @ret = Lan.AutoPackages elsif @func == "SetModified" - @ret = LanItems.SetModified + @ret = Lan.SetModified elsif @func == "GetModified" - @ret = LanItems.GetModified + @ret = Lan.Modified elsif @func == "Export" @settings2 = Lan.Export Builtins.y2debug("settings: %1", @settings2) diff --git a/src/include/network/widgets.rb b/src/include/network/widgets.rb index a20e40b3f..5bf4b5f8a 100644 --- a/src/include/network/widgets.rb +++ b/src/include/network/widgets.rb @@ -116,7 +116,7 @@ def ManagedStore(_key, _event) end if NetworkService.Modified - LanItems.SetModified + Lan.SetModified if Stage.normal && NetworkService.is_network_manager Popup.AnyMessage( diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 4a69a80d7..991050052 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -100,6 +100,8 @@ def main @backend = nil + @modified = false + # Y2Network::Config objects @configs = {} end @@ -111,7 +113,7 @@ def main # Return a modification status # @return true if data was modified def Modified - return true if LanItems.GetModified + return true if @modified return true unless system_config == yast_config return true if NetworkConfig.Modified return true if NetworkService.Modified @@ -120,6 +122,11 @@ def Modified false end + def SetModified + @modified = true + nil + end + # function for use from autoinstallation (Fate #301032) def isAnyInterfaceDown down = false @@ -396,7 +403,7 @@ def SetIPv6(status) if @ipv6 != status @ipv6 = status Popup.Warning(_("To apply this change, a reboot is needed.")) - LanItems.SetModified + Lan.SetModified end nil diff --git a/test/lan_auto_test.rb b/test/lan_auto_test.rb index 1fbe05433..a715d9188 100755 --- a/test/lan_auto_test.rb +++ b/test/lan_auto_test.rb @@ -34,13 +34,13 @@ context "when func is GetModified" do let(:func) { "GetModified" } - it "returns true if LanItems.GetModified is true" do - expect(Yast::LanItems).to receive(:GetModified).and_return(true) + it "returns true if Lan.GetModified is true" do + expect(Yast::Lan).to receive(:Modified).and_return(true) expect(subject.main).to eq(true) end - it "returns false if LanItems.GetModified is false" do - expect(Yast::LanItems).to receive(:GetModified).and_return(false) + it "returns false if Lan.GetModified is false" do + expect(Yast::Lan).to receive(:Modified).and_return(false) expect(subject.main).to eq(false) end end diff --git a/test/lan_test.rb b/test/lan_test.rb index 875b8cdeb..dac2a2461 100755 --- a/test/lan_test.rb +++ b/test/lan_test.rb @@ -30,12 +30,8 @@ describe "LanClass" do subject { Yast::Lan } - let(:system_config) { instance_double(Y2Network::Config, "System") } - before do - Yast::Lan.clear_configs - allow(Yast::Lan).to receive(:system_config).and_call_original - end + let(:system_config) { Y2Network::Config.new(interfaces: [], source: :sysconfig) } describe "#Packages" do before(:each) do @@ -164,11 +160,11 @@ it "flushes internal state of LanItems correctly when asked for reset" do expect(Yast::Lan.Import(ay_profile)).to be true - expect(Yast::LanItems.GetModified).to be true + expect(Yast::Lan.GetModified).to be true expect(Yast::LanItems.Items).not_to be_empty expect(Yast::Lan.Import({})).to be true - expect(Yast::LanItems.GetModified).to be false + expect(Yast::Lan.GetModified).to be false expect(Yast::LanItems.Items).to be_empty end @@ -180,56 +176,68 @@ end describe "#Modified" do - def reset_modification_statuses - allow(Yast::LanItems).to receive(:GetModified).and_return false - allow(Yast::DNS).to receive(:modified).and_return false + let(:yast_config) { system_config.copy } + + before do allow(Yast::NetworkConfig).to receive(:Modified).and_return false allow(Yast::NetworkService).to receive(:Modified).and_return false allow(Yast::Host).to receive(:GetModified).and_return false + + Yast::Lan.add_config(:system, system_config) + Yast::Lan.add_config(:yast, yast_config) end - def expect_modification_succeedes(modname, method) - reset_modification_statuses + context "when the configuration was not changed" do + it "returns false" do + expect(Yast::Lan.Modified).to eq(false) + end + end - allow(modname) - .to receive(method) - .and_return true + context "when the configuration was changed" do + before do + yast_config.routing.forward_ipv4 = !system_config.routing.forward_ipv4 + end - expect(modname.send(method)).to be true - expect(Yast::Lan.Modified).to be true + it "returns true" do + expect(Yast::Lan.Modified).to eq(true) + end end - it "returns true when LanItems module was modified" do - expect_modification_succeedes(Yast::LanItems, :GetModified) - end + context "when the NetworkConfig module was modified" do + before { allow(Yast::NetworkConfig).to receive(:Modified).and_return(true) } - let(:config) do - Y2Network::Config.new(interfaces: [], routing: routing, source: :sysconfig) + it "returns true" do + expect(Yast::Lan.Modified).to eq(true) + end end - let(:routing) { Y2Network::Routing.new(tables: []) } - it "returns true when Routing module was modified" do - Yast::Lan.add_config(:system, config) - yast_config = config.copy - yast_config.routing.forward_ipv4 = !config.routing.forward_ipv4 - Yast::Lan.add_config(:yast, yast_config) + context "when the NetworkService module was modified" do + before { allow(Yast::NetworkService).to receive(:Modified).and_return(true) } - reset_modification_statuses - expect(Yast::Lan.Modified).to eq(true) - Yast::Lan.clear_configs + it "returns true" do + expect(Yast::Lan.Modified).to eq(true) + end end - it "returns true when NetworkConfig module was modified" do - expect_modification_succeedes(Yast::NetworkConfig, :Modified) + context "when the Host module was modified" do + before { allow(Yast::Host).to receive(:GetModified).and_return(true) } + + it "returns true" do + expect(Yast::Lan.Modified).to eq(true) + end end + end - it "returns true when NetworkService module was modified" do - expect_modification_succeedes(Yast::NetworkService, :Modified) + describe "#SetModified" do + before do + allow(Yast::NetworkConfig).to receive(:Modified).and_return false + allow(Yast::NetworkService).to receive(:Modified).and_return false + allow(Yast::Host).to receive(:GetModified).and_return false end - it "returns false when no module was modified" do - reset_modification_statuses - expect(Yast::Lan.Modified).to be false + it "changes Modified to true" do + subject.main + expect { subject.SetModified }.to change { subject.Modified }.from(false).to(true) end end @@ -571,9 +579,8 @@ def expect_modification_succeedes(modname, method) end it "cleans the configurations list" do - expect { subject.clear_configs } - .to change { subject.find_config(:system) } - .from(system_config).to(nil) + subject.clear_configs + expect(subject.find_config(:system)).to be_nil end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3bf788329..87bf6e85b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -66,7 +66,6 @@ Yast::Lan.clear_configs allow(Yast::NetworkInterfaces).to receive(:Write) allow(Y2Network::Hwinfo).to receive(:hwinfo_from_hardware) - allow(Yast::Lan).to receive(:system_config).and_return(Y2Network::Config.new(source: :testing)) Y2Storage::StorageManager.create_test_instance end end From bf3ac6621d8145abbbfcfcff6f65ee95692f203f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 09:18:21 +0100 Subject: [PATCH 449/471] Drop more unused stuff from LanItems --- src/modules/LanItems.rb | 141 --------------------------------- test/lan_items_helpers_test.rb | 131 ------------------------------ 2 files changed, 272 deletions(-) diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb index 9b90f0003..5ee875bfa 100644 --- a/src/modules/LanItems.rb +++ b/src/modules/LanItems.rb @@ -39,15 +39,11 @@ class LanItemsClass < Module include Wicked def main - Yast.import "UI" textdomain "network" Yast.import "NetworkInterfaces" - Yast.import "ProductFeatures" Yast.import "NetworkConfig" - Yast.import "Host" Yast.import "Directory" - Yast.import "Stage" Yast.include self, "network/complex.rb" Yast.include self, "network/routines.rb" Yast.include self, "network/lan/s390.rb" @@ -640,8 +636,6 @@ def Commit(builder) end end - # TODO: is it still needed? - SetModified() true end @@ -843,55 +837,6 @@ def createUdevFromIfaceName(interfaces) udev_rules end - # Configures available devices for obtaining hostname via specified device - # - # This is related to setting system's hostname via DHCP. Apart of global - # DHCLIENT_SET_HOSTNAME which is set in /etc/sysconfig/network/dhcp and is - # used as default, one can specify the option even per interface. To avoid - # collisions / undeterministic behavior the system should be configured so, - # that just one DHCP interface can update the hostname. E.g. global option - # can be set to "no" and just only one ifcfg can have the option set to "yes". - # - # @param [String] device name where should be hostname configuration active - # @return [Boolean] false when the configuration cannot be set for a device - def conf_set_hostname(device) - return false if !find_dhcp_ifaces.include?(device) - - clear_set_hostname - - ret = SetItemSysconfigOpt(find_configured(device), "DHCLIENT_SET_HOSTNAME", "yes") - - SetModified() - - ret - end - - # Removes DHCLIENT_SET_HOSTNAME from all ifcfgs - # - # @return [Array] list of names of cleared devices - def clear_set_hostname - log.info("Clearing DHCLIENT_SET_HOSTNAME flag from device configs") - - ret = [] - - GetNetcardInterfaces().each do |item_id| - dev_map = GetDeviceMap(item_id) - next if dev_map.nil? || dev_map.empty? - next if !dev_map["DHCLIENT_SET_HOSTNAME"] - - dev_map["DHCLIENT_SET_HOSTNAME"] = nil - - SetDeviceMap(item_id, dev_map) - SetModified() - - ret << GetDeviceName(item_id) - end - - log.info("#{ret.inspect} use default DHCLIENT_SET_HOSTNAME") - - ret - end - # Returns unused name for device of given type # # When already having eth0, eth1, enp0s3 devices (eth type) and asks for new @@ -948,45 +893,6 @@ def self.publish_variable(name, type) publish variable: name, type: type end - # Returns a formated string with the interfaces that are part of a bridge - # or of a bond interface. - # - # @param [String] ifcfg_type - # @param [String] ifcfg_name - # @return [String] formated string with the interface type and the interfaces enslaved - def slaves_desc(ifcfg_type, ifcfg_name) - if ifcfg_type == "bond" - slaves = Y2Network::Config.find(:yast).interfaces.bond_slaves(ifcfg_name) - desc = _("Bonding slaves") - else - slaves = Y2Network::Config.find(:yast).interfaces.bridge_slaves(ifcfg_name) - desc = _("Bridge Ports") - end - - format("%s: %s", desc, slaves.join(" ")) - end - - # Check if the given interface is enslaved in a bond or in a bridge - # - # @return [Boolean] true if enslaved - def enslaved?(ifcfg_name) - bond_index = Y2Network::Config.find(:yast).interfaces.bond_index - bridge_index = Y2Network::Config.find(:yast).interfaces.bridge_index - - return true if bond_index[ifcfg_name] || bridge_index[ifcfg_name] - - false - end - - # Return wether the routing devices list needs to be updated or not to include - # the current interface name - # - # @return [Boolean] false if the current interface name is already present - def update_routing_devices? - device_names = yast_config.interfaces.map(&:name) - !device_names.include?(current_name) - end - # Adds a new interface with the given name # # @todo This method exists just to keep some compatibility during @@ -1013,55 +919,8 @@ def move_routes(from, to) .each { |r| r.interface = target_interface } end - # Renames an interface - # - # @todo This method exists just to keep some compatibility during - # the migration to network-ng. - - # @param old_name [String] Old device name - def rename_current_device_in_routing(old_name) - config = yast_config - return if config.nil? - interface = config.interfaces.by_name(old_name) - return unless interface - interface.name = current_name - end - - # Removes the interface with the given name - # - # @todo This method exists just to keep some compatibility during - # the migration to network-ng. - # @todo It does not check orphan routes. - def remove_current_device_from_routing - config = yast_config - return if config.nil? - name = current_name - return if name.empty? - config.interfaces.delete_if { |i| i.name == name } - end - private - # Checks if given lladdr can be written into ifcfg - # - # @param lladdr [String] logical link address, usually MAC address in case - # of qeth device - # @return [true, false] check result - def s390_correct_lladdr(lladdr) - return false if !Arch.s390 - return false if lladdr.nil? - return false if lladdr.empty? - return false if lladdr.strip == "00:00:00:00:00:00" - - true - end - - # Removes all records connected to the ip from /etc/hosts - def drop_hosts(ip) - log.info("Deleting hostnames assigned to #{ip} from /etc/hosts") - Host.remove_ip(ip) - end - # Searches available items according sysconfig option # # Expects a block. The block is provided diff --git a/test/lan_items_helpers_test.rb b/test/lan_items_helpers_test.rb index d62a2b2ea..aff1f2138 100755 --- a/test/lan_items_helpers_test.rb +++ b/test/lan_items_helpers_test.rb @@ -115,32 +115,6 @@ end end -describe "LanItemsClass#s390_correct_lladdr" do - Yast.import "Arch" - - before(:each) do - allow(Yast::Arch) - .to receive(:s390) - .and_return(true) - end - - it "fails if given lladdr is nil" do - expect(Yast::LanItems.send(:s390_correct_lladdr, nil)).to be false - end - - it "fails if given lladdr is empty" do - expect(Yast::LanItems.send(:s390_correct_lladdr, "")).to be false - end - - it "fails if given lladdr contains zeroes only" do - expect(Yast::LanItems.send(:s390_correct_lladdr, "00:00:00:00:00:00")).to be false - end - - it "succeeds if given lladdr contains valid MAC" do - expect(Yast::LanItems.send(:s390_correct_lladdr, "0a:00:27:00:00:00")).to be true - end -end - describe "LanItems#find_type_ifaces" do let(:mocked_items) do { @@ -313,39 +287,6 @@ def mock_items(dev_maps) end end - describe "LanItems#clear_set_hostname" do - let(:dhcp_yes_maps) do - { - "eth0" => { "DHCLIENT_SET_HOSTNAME" => "yes" } - }.freeze - end - let(:dhcp_no_maps) do - { - "eth1" => { "DHCLIENT_SET_HOSTNAME" => "no" } - }.freeze - end - let(:no_dhclient_maps) do - { "eth6" => { "BOOT" => "dhcp" } }.freeze - end - - it "clears all DHCLIENT_SET_HOSTNAME options" do - dhclient_maps = dhcp_yes_maps.merge(dhcp_no_maps) - mock_items(dhclient_maps.merge(no_dhclient_maps)) - - expect(Yast::LanItems) - .to receive(:SetDeviceMap) - .with(kind_of(Integer), "DHCLIENT_SET_HOSTNAME" => nil) - .twice - expect(Yast::LanItems) - .to receive(:SetModified) - .at_least(:once) - - ret = Yast::LanItems.clear_set_hostname - - expect(ret).to eql dhclient_maps.keys - end - end - describe "LanItems#valid_dhcp_cfg?" do def mock_dhcp_setup(ifaces, global) allow(Yast::LanItems) @@ -446,78 +387,6 @@ def mock_dhcp_setup(ifaces, global) end end - describe "LanItems.rename_current_device_in_routing" do - let(:eth0) { Y2Network::Interface.new("eth0") } - let(:wlan0) { Y2Network::Interface.new("wlan0") } - let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, wlan0]) } - let(:yast_config) do - instance_double(Y2Network::Config, interfaces: interfaces, routing: double("routing")) - end - - before do - allow(Y2Network::Config).to receive(:find).with(:yast).and_return(yast_config) - allow(Yast::LanItems).to receive(:current_name).and_return("wlan1") - end - - it "updates the list of Routing devices with current device names" do - Yast::LanItems.rename_current_device_in_routing("wlan0") - new_names = yast_config.interfaces.map(&:name) - expect(new_names).to eq(["eth0", "wlan1"]) - end - end - - describe "LanItems.remove_current_device_from_routing" do - let(:eth0) { Y2Network::Interface.new("eth0") } - let(:wlan0) { Y2Network::Interface.new("wlan0") } - let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, wlan0]) } - - let(:yast_config) do - instance_double(Y2Network::Config, interfaces: interfaces, routing: double("routing")) - end - - before do - allow(Y2Network::Config).to receive(:find).with(:yast).and_return(yast_config) - allow(Yast::LanItems).to receive(:current_name).and_return("wlan0") - end - - it "removes the device" do - Yast::LanItems.remove_current_device_from_routing - names = yast_config.interfaces.map(&:name) - expect(names).to eq(["eth0"]) - end - end - - describe "LanItems.update_routing_devices?" do - let(:eth0) { Y2Network::Interface.new("eth0") } - let(:wlan0) { Y2Network::Interface.new("wlan0") } - let(:interfaces) { Y2Network::InterfacesCollection.new([eth0, wlan0]) } - - let(:yast_config) do - instance_double(Y2Network::Config, interfaces: interfaces, routing: double("routing")) - end - - before do - allow(Y2Network::Config).to receive(:find).with(:yast).and_return(yast_config) - allow(Yast::LanItems).to receive(:current_name).and_return(current_name) - end - - context "when there are no changes in the device names" do - let(:current_name) { "eth0" } - - it "returns false" do - expect(Yast::LanItems.update_routing_devices?).to eql(false) - end - end - - context "when some interface have been renaming and Routing device names differs" do - let(:current_name) { "eth1" } - - it "returns true" do - expect(Yast::LanItems.update_routing_devices?).to eql(true) - end - end - end - describe "LanItems.move_routes" do let(:routing) { Y2Network::Routing.new(tables: [table1]) } let(:table1) { Y2Network::RoutingTable.new(routes) } From 8b527b2a55861b327fc7ed2cba56efed16de5eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 11:49:40 +0100 Subject: [PATCH 450/471] Fix the Lan#refresh_lan_items * Now it only refreshes the interfaces. * Renamed to refresh_interfaces to make its intention clear. --- src/lib/y2network/interfaces_collection.rb | 2 ++ src/modules/Lan.rb | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lib/y2network/interfaces_collection.rb b/src/lib/y2network/interfaces_collection.rb index 50cc5b030..19591cdf3 100644 --- a/src/lib/y2network/interfaces_collection.rb +++ b/src/lib/y2network/interfaces_collection.rb @@ -19,6 +19,7 @@ require "yast" require "y2network/interface" +require "y2network/can_be_copied" require "forwardable" module Y2Network @@ -41,6 +42,7 @@ module Y2Network class InterfacesCollection extend Forwardable include Yast::Logger + include CanBeCopied # @return [Array] List of interfaces attr_reader :interfaces diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 991050052..a81995e68 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -870,7 +870,7 @@ def ProposeVirtualized builder.configure_as_slave builder.save LanItems.move_routes(builder.name, bridge_builder.name) - refresh_lan_items + refresh_interfaces end nil @@ -1044,12 +1044,16 @@ def connected_and_bridgeable?(bridge_builder, interface) true end - # Refreshes YaST network configuration + # Refreshes YaST network interfaces # - # It does not modified the system configuration that was already read. - def refresh_lan_items - yast_config = Y2Network::Config.from(:sysconfig) - Yast::Lan.add_config(:yast, yast_config) + # It refreshes system configuration and update the list of interfaces + # for the current YaST configuration. The rest of the configuration + # is not modified. + # + # TODO: consider adding an API to Y2Network::Config to do partial refreshes. + def refresh_interfaces + system_config = Y2Network::Config.from(:sysconfig) + yast_config.interfaces = system_config.interfaces.copy end # Reads system configuration From b70bad983597f7f1a33df558dae3b4f2c3c9cddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 11:55:26 +0100 Subject: [PATCH 451/471] Do not offer an option to do not assign the firewall zone * It is being ignored by wicked. --- src/lib/y2network/widgets/firewall_zone.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/lib/y2network/widgets/firewall_zone.rb b/src/lib/y2network/widgets/firewall_zone.rb index 40cb54f3a..848e0739d 100644 --- a/src/lib/y2network/widgets/firewall_zone.rb +++ b/src/lib/y2network/widgets/firewall_zone.rb @@ -102,12 +102,6 @@ def default_label _("Assign to the default ZONE") end - # @return [String] - def no_zone_label - # TRANSLATORS: List item to no interface ZONE assignment - _("Do not assign ZONE") - end - # @return [Yast::Term] zones select list def zones_widget ComboBox(Id(:zones), Opt(:notify, :hstretch), label) @@ -140,7 +134,7 @@ def populate_select(zones) # @return [Array >] list of names an description of # available zones def firewall_zones - zones = [[nil, no_zone_label], ["", default_label]] + zones = [["", default_label]] firewalld.zones.each { |z| zones << [z.name, z.name] } zones end From d9991b2ebfea4373fd55c923d8821dbc9df17176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 11:56:05 +0100 Subject: [PATCH 452/471] IPConfig#== will not crash when the argument is nil --- src/lib/y2network/connection_config/ip_config.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/y2network/connection_config/ip_config.rb b/src/lib/y2network/connection_config/ip_config.rb index 2579b6ca1..1b291a6a4 100644 --- a/src/lib/y2network/connection_config/ip_config.rb +++ b/src/lib/y2network/connection_config/ip_config.rb @@ -55,6 +55,7 @@ def initialize(address, id: "", label: nil, remote_address: nil, broadcast: nil) # # @return [Boolean] true if both are equal; false otherwise def ==(other) + return false if other.nil? address == other.address && label == other.label && remote_address == other.remote_address && broadcast == other.broadcast && id == other.id From d0fbf3e1a363e718218642f83f5bdca3037438e4 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 19 Sep 2019 13:26:16 +0200 Subject: [PATCH 453/471] return back popup that network manager is running --- src/lib/y2network/connection_config/base.rb | 1 + src/lib/y2network/widgets/interfaces_table.rb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index b7bc5d0f9..bce5dbbb0 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -65,6 +65,7 @@ class Base def initialize @ip_aliases = [] @bootproto = BootProtocol::STATIC # TODO: maybe do test query if physical interface is attached? + @ip = IPConfig.new(IPAddress.from_string("0.0.0.0/36")) @startmode = Startmode.create("manual") @description = "" @ethtool_options = "" diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb index 9432be677..0d7a61f39 100644 --- a/src/lib/y2network/widgets/interfaces_table.rb +++ b/src/lib/y2network/widgets/interfaces_table.rb @@ -21,6 +21,11 @@ require "cwm/table" require "y2network/presenters/interface_summary" +Yast.import "NetworkService" +Yast.import "Lan" +Yast.import "Popup" +Yast.import "UI" + module Y2Network module Widgets class InterfacesTable < CWM::Table @@ -65,6 +70,18 @@ def items # Workaround for usage in old CWM which also cache content of cwm items def init + if Yast::NetworkService.is_network_manager + Yast::Popup.Warning( + _( + "Network is currently handled by NetworkManager\n" \ + "or completely disabled. YaST is unable to configure some options." + ) + ) + # switch to global tab + Yast::UI.FakeUserInput("ID" => "global") + return + end + change_items(items) handle end From 3ad37176fe34e9b62466b71645ad9a982c28f3b6 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 19 Sep 2019 13:28:33 +0200 Subject: [PATCH 454/471] remove no longer used code --- src/modules/Lan.rb | 36 --------------- test/lan_test.rb | 108 --------------------------------------------- 2 files changed, 144 deletions(-) diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 0682d07bc..865a8b9c7 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -810,42 +810,6 @@ def UseNetworkManager nm_default && nm_installed end - def IfcfgsToSkipVirtualizedProposal - skipped = [] - yast_config = Y2Network::Config.find(:yast) - - LanItems.Items.each do |_current, config| - ifcfg = config["ifcfg"] - ifcfg_type = NetworkInterfaces.GetType(ifcfg) - - case ifcfg_type - when "br" - skipped << ifcfg - - yast_config.interfaces.bridge_slaves(ifcfg).each { |port| skipped << port } - when "bond" - yast_config.interfaces.bond_slaves(ifcfg).each do |slave| - log.info("For interface #{ifcfg} found slave #{slave}") - skipped << slave - end - - # Skip also usb and wlan devices as they are not good for bridge proposal (bnc#710098) - when "usb", "wlan" - log.info("#{ifcfg_type} device #{ifcfg} skipped from bridge proposal") - skipped << ifcfg - end - - next unless NetworkInterfaces.GetValue(ifcfg, "STARTMODE") == "nfsroot" - - log.info("Skipped #{ifcfg} interface from bridge slaves because of nfsroot.") - - skipped << ifcfg - end - log.info("Skipped interfaces : #{skipped}") - - skipped - end - def ProposeVirtualized # then each configuration (except bridges) move to the bridge # and add old device name into bridge_ports diff --git a/test/lan_test.rb b/test/lan_test.rb index 875b8cdeb..c80754b9d 100755 --- a/test/lan_test.rb +++ b/test/lan_test.rb @@ -248,114 +248,6 @@ def expect_modification_succeedes(modname, method) end end - describe "#IfcfgsToSkipVirtualizedProposal" do - let(:items) do - { - "0" => { "ifcfg" => "bond0" }, - "1" => { "ifcfg" => "br0" }, - "2" => { "ifcfg" => "eth0" }, - "3" => { "ifcfg" => "eth1" }, - "4" => { "ifcfg" => "wlan0" }, - "5" => { "ifcfg" => "wlan1" } - } - end - - let(:current_interface) do - { - "ONBOOT" => "yes", - "BOOTPROTO" => "dhcp", - "DEVICE" => "br1", - "BRIDGE" => "yes", - "BRIDGE_PORTS" => "eth1", - "BRIDGE_STP" => "off", - "IPADDR" => "10.0.0.1", - "NETMASK" => "255.255.255.0" - } - end - - context "when various interfaces are present in the system" do - let(:interfaces) { Y2Network::InterfacesCollection.new([]) } - - before do - allow(Yast::NetworkInterfaces).to receive(:GetType).with("br0").and_return("br") - allow(Yast::NetworkInterfaces).to receive(:GetType).with("bond0").and_return("bond") - allow(Yast::NetworkInterfaces).to receive(:GetType).with("eth0").and_return("eth") - allow(Yast::NetworkInterfaces).to receive(:GetType).with("eth1").and_return("eth") - allow(Yast::NetworkInterfaces).to receive(:GetType).with("wlan0").and_return("usb") - allow(Yast::NetworkInterfaces).to receive(:GetType).with("wlan1").and_return("wlan") - allow(Yast::NetworkInterfaces).to receive(:Current).and_return(current_interface) - allow(Yast::NetworkInterfaces).to receive(:GetValue).and_return(nil) - allow(Yast::LanItems).to receive(:Items).and_return(items) - allow(Y2Network::Config) - .to receive(:find) - .and_return(instance_double(Y2Network::Config, interfaces: interfaces)) - end - - context "and one of them is a bridge" do - it "returns an array containining the bridge interface" do - (expect Yast::Lan.IfcfgsToSkipVirtualizedProposal).to include("br0") - end - - it "returns an array containing the bridged interfaces" do - allow(interfaces).to receive(:bridge_slaves).and_return(["eth1"]) - - expect(Yast::Lan.IfcfgsToSkipVirtualizedProposal).to include("eth1") - expect(Yast::Lan.IfcfgsToSkipVirtualizedProposal).to_not include("eth0") - end - end - - context "and one of them is a bond" do - let(:current_interface) do - { - "BOOTPROTO" => "static", - "BONDING_MASTER" => "yes", - "DEVICE" => "bond0", - "BONDING_SLAVE" => "eth0" - } - end - - it "returns an array containing the bonded interfaces" do - expect(Yast::Lan.IfcfgsToSkipVirtualizedProposal).not_to include("bond0") - end - end - - context "and one of them is an usb or a wlan interface" do - it "returns an array containing the interface" do - expect(Yast::Lan.IfcfgsToSkipVirtualizedProposal).to include("wlan0", "wlan1") - end - end - - context "and the interface startmode is 'nfsroot'" do - it "returns an array containing the interface" do - allow(Yast::NetworkInterfaces).to receive(:GetValue) - .with("eth0", "STARTMODE").and_return("nfsroot") - - expect(Yast::Lan.IfcfgsToSkipVirtualizedProposal).to include("eth0") - end - end - - context "and all the interfaces are bridgeable" do - let(:current_item) do - { - "BOOTPROTO" => "dhcp", - "STARTMODE" => "auto" - } - end - it "returns an empty array" do - allow(Yast::NetworkInterfaces).to receive(:GetType).and_return("eth") - expect(Yast::Lan.IfcfgsToSkipVirtualizedProposal).to eql([]) - end - end - end - - context "there is no interfaces in the system" do - it "returns an empty array" do - allow(Yast::LanItems).to receive(:Items).and_return({}) - expect(Yast::Lan.IfcfgsToSkipVirtualizedProposal).to eql([]) - end - end - end - xdescribe "#ProposeVirtualized" do before do From 814f4bcd80f7c23adfbf6769e97ce2c8cdb1fe4a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 19 Sep 2019 13:44:02 +0200 Subject: [PATCH 455/471] fix writting bond --- src/lib/y2network/sysconfig/connection_config_writers/bonding.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb b/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb index a48a45214..43e0cb939 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb @@ -32,6 +32,7 @@ class Bonding < Base def update_file(conn) file.bonding_slaves = file_slaves(conn) file.bonding_module_opts = conn.options + file.bonding_master = "yes" end # Convenience method to obtain the map of bonding slaves in the file From d4ca2f6af905ea1829da20a562fecaff8381ea51 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 19 Sep 2019 15:04:38 +0200 Subject: [PATCH 456/471] propose reasonable forward delay for new bridges --- src/lib/y2network/connection_config/bridge.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/bridge.rb b/src/lib/y2network/connection_config/bridge.rb index d96956530..9a484d904 100644 --- a/src/lib/y2network/connection_config/bridge.rb +++ b/src/lib/y2network/connection_config/bridge.rb @@ -36,7 +36,7 @@ def initialize super() @ports = [] @stp = false - @forward_delay = 0 + @forward_delay = 15 end def virtual? From a265196be85897e4b788c7b360bb8b57ac269faf Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 19 Sep 2019 15:41:46 +0200 Subject: [PATCH 457/471] fix typo --- src/lib/y2network/connection_config/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index bce5dbbb0..43ead3ac4 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -65,7 +65,7 @@ class Base def initialize @ip_aliases = [] @bootproto = BootProtocol::STATIC # TODO: maybe do test query if physical interface is attached? - @ip = IPConfig.new(IPAddress.from_string("0.0.0.0/36")) + @ip = IPConfig.new(IPAddress.from_string("0.0.0.0/32")) @startmode = Startmode.create("manual") @description = "" @ethtool_options = "" From 103e53c8c082f0e4390f05baa4869821a6aa78e2 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 19 Sep 2019 17:24:50 +0200 Subject: [PATCH 458/471] avoid crash when deleting unconfigured device --- src/lib/y2network/widgets/delete_interface.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/y2network/widgets/delete_interface.rb b/src/lib/y2network/widgets/delete_interface.rb index a5747e04c..176eb0c95 100644 --- a/src/lib/y2network/widgets/delete_interface.rb +++ b/src/lib/y2network/widgets/delete_interface.rb @@ -40,6 +40,8 @@ def label def handle config = Yast::Lan.yast_config connection_config = config.connections.by_name(@table.value) + return nil unless connection_config # unconfigured physical device. Delete do nothing + if connection_config.startmode.name == "nfsroot" if !Yast::Popup.YesNoHeadline( Label.WarningMsg, From 0a8bada8578076607ad8047b1669f88c57b0ee91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 16:45:02 +0100 Subject: [PATCH 459/471] Add a ConnectionConfigsCollection#select method --- src/lib/y2network/connection_configs_collection.rb | 8 ++++++++ test/y2network/connection_configs_collection_test.rb | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index 1f16b32c3..3abb9e0d6 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -85,6 +85,14 @@ def remove(connection_config) connection_configs.reject! { |c| c.name == name } end + # Selects connections which satisfy the given +block+ + # + # @param block [Proc] + # @return [ConnectionConfigsCollection] Collection including the selected connections + def select(&block) + self.class.new(to_a.select(&block)) + end + # Compares ConnectionConfigsCollection # # @return [Boolean] true when both collections contain only equal connections, diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb index 2eb72ec0f..071bf2a14 100644 --- a/test/y2network/connection_configs_collection_test.rb +++ b/test/y2network/connection_configs_collection_test.rb @@ -74,6 +74,13 @@ end end + describe "#select" do + it "returns a collection containing those configs which satisfy the block" do + selected = collection.select { |c| c.name == "wlan0" } + expect(selected).to eq(described_class.new([wlan0])) + end + end + describe "#remove" do context "when a connection configuration having the same name exists" do it "removes the configuration from the collection" do From 4dda3b16497d1af09e13e11a1574282eebab00b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 14:40:23 +0100 Subject: [PATCH 460/471] Read and write connection configs hostnames --- src/lib/y2network/connection_config/base.rb | 11 ++- src/lib/y2network/interface_config_builder.rb | 32 +------- src/lib/y2network/sysconfig/config_reader.rb | 3 + src/lib/y2network/sysconfig/config_writer.rb | 28 +++++-- .../connection_config_readers/base.rb | 12 +++ .../sysconfig/connection_config_writer.rb | 11 ++- .../connection_config_writers/base.rb | 9 +++ test/data/scr_read/etc/hosts | 2 + .../interface_config_builder_test.rb | 81 ++----------------- .../y2network/sysconfig/config_writer_test.rb | 29 ++++--- .../ethernet_test.rb | 34 ++++++++ .../connection_config_writer_test.rb | 58 +++++++++---- .../ethernet_test.rb | 6 ++ 13 files changed, 175 insertions(+), 141 deletions(-) create mode 100644 test/data/scr_read/etc/hosts diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 43ead3ac4..b4bbe5e7b 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -60,6 +60,8 @@ class Base attr_accessor :ethtool_options # @return [String] assigned firewall zone to interface attr_accessor :firewall_zone + # @return [String] interface's hostname + attr_accessor :hostname # Constructor def initialize @@ -78,7 +80,7 @@ def initialize # false otherwise def ==(other) [:name, :interface, :bootproto, :ip, :ip_aliases, :mtu, :startmode, - :description, :lladdress, :ethtool_options, :firewall_zone].all? do |method| + :description, :lladdress, :ethtool_options, :firewall_zone, :hostname].all? do |method| public_send(method) == other.public_send(method) end end @@ -166,6 +168,13 @@ def find_master(configs) end end + # Returns whether the connection is configured as static + # + # @return [Boolean] return true if the connection is static; false otherwise + def static? + bootproto == BootProtocol::STATIC + end + private def replace_ifplugd? diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb index aff3261f8..a5abdf1d6 100644 --- a/src/lib/y2network/interface_config_builder.rb +++ b/src/lib/y2network/interface_config_builder.rb @@ -130,9 +130,6 @@ def save yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface? yast_config.add_or_update_connection_config(@connection_config) - # write to ifcfg always and to firewalld only when available - save_hostname - nil end @@ -321,28 +318,12 @@ def subnet_prefix=(value) # @return [String] def hostname - return @hostname if @hostname - original_hostname + @connection_config.hostname || "" end # @param [String] value def hostname=(value) - @hostname = value - end - - # Saves the hostname - # - # The hostname entry must be updated when the IP or the hostname change. Moreover, it must be - # removed when the hostname is empty or when the boot protocol is not STATIC (as there is no IP - # to associate with the name). - def save_hostname - if !required_ip_config? - Yast::Host.remove_ip(@original_ip_config.address.to_s) - return - end - - return if @original_ip_config == connection_config.ip && original_hostname == hostname - Yast::Host.Update(original_hostname, hostname, @connection_config.ip.address.to_s) + @connection_config.hostname = value end # sets remote ip for ptp connections @@ -445,15 +426,6 @@ def required_ip_config? boot_protocol == BootProtocol::STATIC end - # Returns the original hostname - # - # @return [String] Original hostname - def original_hostname - return @original_hostname if @original_hostname - names = Yast::Host.names(@original_ip_config.address.to_s) - @original_hostname = names.first || "" - end - # Determines whether the driver should be set automatically # # @return [Boolean] diff --git a/src/lib/y2network/sysconfig/config_reader.rb b/src/lib/y2network/sysconfig/config_reader.rb index c7a7db144..6c27b3037 100644 --- a/src/lib/y2network/sysconfig/config_reader.rb +++ b/src/lib/y2network/sysconfig/config_reader.rb @@ -28,6 +28,7 @@ require "y2network/interfaces_collection" Yast.import "NetworkInterfaces" +Yast.import "Host" module Y2Network module Sysconfig @@ -40,6 +41,8 @@ def initialize(_opts = {}) # @return [Y2Network::Config] Network configuration def config + Yast::Host.Read + routing_tables = find_routing_tables(interfaces_reader.interfaces) routing = Routing.new( tables: routing_tables, forward_ipv4: forward_ipv4?, forward_ipv6: forward_ipv6? diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 25ce377d7..2d8a64ea1 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -24,12 +24,14 @@ require "y2network/sysconfig/connection_config_writer" require "y2network/sysconfig/interfaces_writer" +Yast.import "Host" + module Y2Network module Sysconfig # This class imports a configuration into YaST modules # # Ideally, it should be responsible of writing the changes to the underlying - # system. But, for the time being, it just relies in {Yast::Routing}. + # system. class ConfigWriter include Yast::Logger @@ -52,6 +54,8 @@ def write(config, old_config = nil) write_interfaces(config.interfaces) write_connections(config.connections, old_config) write_dns_settings(config, old_config) + + Yast::Host.Write(gui: false) end private @@ -187,18 +191,14 @@ def write_interfaces(interfaces) # Writes connections configuration # - # @todo Handle old connections (removing those that are needed, etc.) + # @todo Handle old connections (removing those that are not needed, etc.) # # @param conns [Array] Connections to write # @param old_config [Y2Network::Config,nil] Old configuration; nil if it is unknown def write_connections(conns, old_config) + # FIXME: this code might live in its own class writer = Y2Network::Sysconfig::ConnectionConfigWriter.new - if old_config - old_connections = old_config.connections - to_remove = old_connections.map(&:name) - conns.map(&:name) - log.info "removing connections #{to_remove.inspect}" - to_remove.each { |name| writer.remove(name) } - end + remove_old_connections(conns, old_config.connections, writer) if old_config conns.each { |c| writer.write(c) } end @@ -208,6 +208,18 @@ def write_connections(conns, old_config) def write_drivers(drivers) Y2Network::Driver.write_options(drivers) end + + # Removes old connections files + # + # @param conns [ConnectionConfigsCollection] New connections + # @param old_conns [ConnectionConfigsCollection] Old connections + # @param writer [Sysconfig::ConnectionConfigWriter] Writer instance to save changes + def remove_old_connections(conns, old_conns, writer) + names_to_remove = old_conns.map(&:name) - conns.map(&:name) + to_remove = old_conns.select { |c| names_to_remove.include?(c.name) } + log.info "removing connections #{names_to_remove.inspect}" + to_remove.each { |c| writer.remove(c) } + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/sysconfig/connection_config_readers/base.rb index 501193550..7cdf888ee 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_readers/base.rb @@ -22,6 +22,8 @@ require "y2network/boot_protocol" require "y2network/startmode" +Yast.import "Host" + module Y2Network module Sysconfig module ConnectionConfigReaders @@ -56,6 +58,7 @@ def connection_config conn.startmode.priority = file.ifplugd_priority if conn.startmode.name == "ifplugd" conn.ethtool_options = file.ethtool_options conn.firewall_zone = file.zone + conn.hostname = hostname(conn) update_connection_config(conn) end end @@ -112,6 +115,15 @@ def build_ip(ip, prefix, netmask) ipaddr.prefix = prefix if prefix ipaddr end + + # Returns the hostname for the given connection + # + # @return [String,nil] + def hostname(conn) + return nil unless conn.ip + Yast::Host.Read + Yast::Host.names(conn.ip.address.address.to_s).first + end end end end diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index 90a5c4ed3..ddf5bb5e7 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -18,9 +18,13 @@ # find current contact information at www.suse.com. require "y2network/sysconfig/interface_file" +require "y2network/sysconfig/routes_file" + +Yast.import "Host" module Y2Network module Sysconfig + # This class is responsible for writing interfaces changes class ConnectionConfigWriter include Yast::Logger @@ -38,10 +42,11 @@ def write(conn) # Removes connection config from the underlying system # - # @param name [String] Connection name to remove - def remove(name) - ifcfg = Y2Network::Sysconfig::InterfaceFile.find(name) + # @param conn [Y2Network::Conn] Connection name to remove + def remove(conn) + ifcfg = Y2Network::Sysconfig::InterfaceFile.find(conn.interface) ifcfg && ifcfg.remove + Yast::Host.remove_ip(conn.ip.address.address.to_s) if conn.ip end private diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index 4136f1f27..874029ac8 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -51,6 +51,7 @@ def write(conn) file.zone = conn.firewall_zone add_ips(conn) update_file(conn) + add_hostname(conn) if conn.static? end private @@ -82,6 +83,14 @@ def add_ip(ip) file.remote_ipaddrs[ip.id] = ip.remote_address file.broadcasts[ip.id] = ip.broadcast end + + # Adds the hostname to /etc/hosts + # + # @param conn [Y2Network::ConnectionConfig::Base] Connection to take settings from + def add_hostname(conn) + return unless conn.hostname && conn.ip + Yast::Host.Update("", conn.hostname, conn.ip.address.address.to_s) + end end end end diff --git a/test/data/scr_read/etc/hosts b/test/data/scr_read/etc/hosts new file mode 100644 index 000000000..e6b73b292 --- /dev/null +++ b/test/data/scr_read/etc/hosts @@ -0,0 +1,2 @@ +127.0.0.1 localhost +192.168.123.1 foo \ No newline at end of file diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index c4100978c..21e1ded01 100644 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -217,79 +217,6 @@ end end - describe "#save_hostname" do - subject(:config_builder) { Y2Network::InterfaceConfigBuilder.for("eth", config: conn) } - let(:conn) do - Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.ip = original_ip_config } - end - - let(:original_ip_config) do - Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.new("10.0.0.1")) - end - - before do - allow(Yast::Host).to receive(:names).with("10.0.0.1").and_return(["original.example.net"]) - config_builder.hostname # FIXME: Force hostname initialization (it should be done implicitly) - end - - context "when the hostname has changed" do - before do - config_builder.hostname = "new.example.net" - end - - it "updates the hostname" do - expect(Yast::Host).to receive(:Update) - .with("original.example.net", "new.example.net", "10.0.0.1") - config_builder.save_hostname - end - - context "and the hostname is empty" do - before do - config_builder.hostname = "" - end - - it "removes the hostname" do - expect(Yast::Host).to receive(:Update) - .with("original.example.net", "", "10.0.0.1") - config_builder.save_hostname - end - end - end - - context "when the IP has changed" do - before do - config_builder.ip_address = "192.168.122.1" - end - - it "updates the IP" do - expect(Yast::Host).to receive(:Update) - .with("original.example.net", "original.example.net", "192.168.122.1") - config_builder.save_hostname - end - end - - context "when configuration has not changed" do - it "does not change the hostname" do - expect(Yast::Host).to_not receive(:remove_ip) - expect(Yast::Host).to_not receive(:Update) - - config_builder.save_hostname - end - end - - context "when there is boot protocol is not static" do - before do - config_builder.boot_protocol = "none" - config_builder.ip_address = "192.168.122.1" - end - - it "removes old hostname if it exists" do - expect(Yast::Host).to receive(:remove_ip) - config_builder.save_hostname - end - end - end - describe "#hwinfo_from" do let(:hwinfo) { { "dev_name" => "", "busid" => "0.0.0700" } } @@ -298,4 +225,12 @@ expect(config_builder.hwinfo.busid).to eq("0.0.0700") end end + + describe "#hostname=" do + it "sets the hostname for the connection config" do + expect(subject.connection_config).to receive(:hostname=).with("foo").and_call_original + expect { subject.hostname = "foo" }.to change { subject.hostname } + .from("").to("foo") + end + end end diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 48660caef..13ecb3db2 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -33,6 +33,10 @@ subject(:writer) { described_class.new } describe "#write" do + before do + allow(Yast::Host).to receive(:Write) + end + let(:config) do Y2Network::Config.new( interfaces: Y2Network::InterfacesCollection.new([eth0]), @@ -174,23 +178,19 @@ ) end - let(:ifcfg_eth0) do - instance_double(Y2Network::Sysconfig::InterfaceFile).as_null_object + let(:conn_writer) { instance_double(Y2Network::Sysconfig::ConnectionConfigWriter) } + let(:ifroute_eth1) do + instance_double(Y2Network::Sysconfig::RoutesFile, save: nil, :routes= => nil, remove: nil) end before do - allow(Y2Network::Sysconfig::InterfaceFile).to receive(:find) - .with("eth0") - .and_return(ifcfg_eth0) - - # unconfiguring device will also remove its routes file - allow(Y2Network::Sysconfig::RoutesFile).to receive(:new) - .with("/etc/sysconfig/network/ifroute-eth0") - .and_return(instance_double(Y2Network::Sysconfig::RoutesFile).as_null_object) + allow(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:new) + .and_return(conn_writer) + allow(Y2Network::Sysconfig::RoutesFile).to receive(:new).and_return(ifroute_eth1) end - it "removes the ifcfg file" do - expect(ifcfg_eth0).to receive(:remove) + it "removes the connection" do + expect(conn_writer).to receive(:remove).with(eth0_conn) writer.write(config, old_config) end end @@ -243,5 +243,10 @@ expect(interfaces_writer).to receive(:write).with(config.interfaces) writer.write(config) end + + it "writes /etc/hosts changes" do + expect(Yast::Host).to receive(:Write).with(gui: false) + writer.write(config) + end end end diff --git a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb index 98d8783bf..cdcea4a29 100644 --- a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb @@ -61,5 +61,39 @@ expect(eth.ip.address).to eq(Y2Network::IPAddress.from_string("10.0.0.1/8")) end end + + context "when the configuration is static" do + before do + Yast::Host.main + Yast::Host.Read + end + + context "and a hostname is specified" do + it "sets the hostname" do + eth = handler.connection_config + expect(eth.hostname).to eq("foo") + end + end + + context "and a hostname is not specified" do + let(:interface_name) { "eth1" } + + it "does not set the hostname" do + eth = handler.connection_config + expect(eth.hostname).to be_nil + end + end + end + + context "when the configuration is not static" do + let(:interface_name) { "eth4" } + + before { Yast::Host.Read } + + it "does not set the hostname" do + eth = handler.connection_config + expect(eth.hostname).to be_nil + end + end end end diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/sysconfig/connection_config_writer_test.rb index 89631d158..2ea4b4bd4 100644 --- a/test/y2network/sysconfig/connection_config_writer_test.rb +++ b/test/y2network/sysconfig/connection_config_writer_test.rb @@ -27,6 +27,25 @@ describe Y2Network::Sysconfig::ConnectionConfigWriter do subject(:writer) { described_class.new } + let(:conn) do + instance_double( + Y2Network::ConnectionConfig::Ethernet, + interface: "eth0", + type: Y2Network::InterfaceType::ETHERNET, + ip: ip_config + ) + end + + let(:ip_config) do + Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.from_string("10.100.0.1/24")) + end + + let(:file) do + instance_double( + Y2Network::Sysconfig::InterfaceFile, save: nil, clean: nil, remove: nil + ) + end + describe "#write" do let(:handler) do instance_double( @@ -35,20 +54,6 @@ ) end - let(:conn) do - instance_double( - Y2Network::ConnectionConfig::Ethernet, - interface: "eth0", - type: Y2Network::InterfaceType::ETHERNET - ) - end - - let(:file) do - instance_double( - Y2Network::Sysconfig::InterfaceFile, save: nil, clean: nil - ) - end - before do allow(writer).to receive(:require).and_call_original allow(Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet).to receive(:new) @@ -68,4 +73,29 @@ writer.write(conn) end end + + describe "#remove" do + before do + allow(Y2Network::Sysconfig::InterfaceFile).to receive(:find).and_return(file) + end + + it "removes the configuration file" do + expect(file).to receive(:remove) + writer.remove(conn) + end + + it "removes the hostname" do + expect(Yast::Host).to receive(:remove_ip).with(conn.ip.address.address.to_s) + writer.remove(conn) + end + + context "if no IP address is defined" do + let(:ip_config) { nil } + + it "does not try to remove the hostname" do + expect(Yast::Host).to_not receive(:remove_ip) + writer.remove(conn) + end + end + end end diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb index d9e8a6fcb..a59ad9e33 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb @@ -65,6 +65,7 @@ c.ip = ip c.ip_aliases = [ip_alias] c.startmode = Y2Network::Startmode.create("auto") + c.hostname = "foo" end end @@ -101,5 +102,10 @@ expect(file.ipaddrs["_0"]).to eq(ip_alias.address) end end + + it "sets the hostname" do + expect(Yast::Host).to receive(:Update).with("", "foo", ip.address.address.to_s) + handler.write(conn) + end end end From 2ed106bc47b2baa651208818c24d3c16d10f3833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 16:47:06 +0100 Subject: [PATCH 461/471] InterfacesWriter is not responsible for remove ifroute-* files --- src/lib/y2network/sysconfig/interfaces_writer.rb | 2 -- test/y2network/sysconfig/interfaces_writer_test.rb | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 7c8a99487..6d3742028 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -105,8 +105,6 @@ def clean_up_old_interfaces(interfaces) set_interface_down(iface.old_name) ifcfg = Y2Network::Sysconfig::InterfaceFile.find(iface.old_name) ifcfg && ifcfg.remove - ifroute = Y2Network::Sysconfig::RoutesFile.find(iface.old_name) - ifroute && ifroute.remove end end diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index 531d522af..f0501ce7f 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -71,12 +71,9 @@ it "removes the old configuration files" do ifcfg_path = File.join(scr_root, "etc", "sysconfig", "network", "ifcfg-eth0") - ifroute_path = File.join(scr_root, "etc", "sysconfig", "network", "ifroute-eth0") expect(File).to exist(ifcfg_path) - expect(File).to exist(ifroute_path) subject.write(interfaces) expect(File).to_not exist(ifcfg_path) - expect(File).to_not exist(ifroute_path) end it "sets the interface down" do From 3dd0e85769deeb2aa877f889ea3857bbdaa17a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 22:47:21 +0100 Subject: [PATCH 462/471] Add an internal ID to collection configuration objects --- src/lib/y2network/connection_config/base.rb | 7 +++++++ .../y2network/connection_configs_collection.rb | 16 ++++++++++++++++ .../connection_configs_collection_test.rb | 12 ++++++++++++ 3 files changed, 35 insertions(+) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index b4bbe5e7b..0d9629404 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -63,8 +63,15 @@ class Base # @return [String] interface's hostname attr_accessor :hostname + # @return [String] Connection identifier + attr_reader :id + + # @return [Integer] Connection identifier counter + @@last_id = 0 + # Constructor def initialize + @id = @@last_id += 1 @ip_aliases = [] @bootproto = BootProtocol::STATIC # TODO: maybe do test query if physical interface is attached? @ip = IPConfig.new(IPAddress.from_string("0.0.0.0/32")) diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index 3abb9e0d6..ea9ae7200 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -61,6 +61,22 @@ def by_interface(interface_name) connection_configs.select { |c| c.interface == interface_name } end + # Returns connection with the given internal ID + # + # @param id [Integer] Internal ID + # @return [ConnectionConfig::Base] Connection config with the given ID + def by_id(id) + connection_configs.find { |c| c.id == id } + end + + # Returns connections with any of the given internal IDs + # + # @param ids [Integer] Internal IDs + # @return [ConnectionConfig::Base] Connection config with the given IDs + def by_ids(*ids) + connection_configs.select { |c| ids.include?(c.id) } + end + # Adds or updates a connection configuration # # @note It uses the name to do the matching. diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb index 071bf2a14..d9370e8b9 100644 --- a/test/y2network/connection_configs_collection_test.rb +++ b/test/y2network/connection_configs_collection_test.rb @@ -52,6 +52,18 @@ end end + describe "#by_id" do + it "retuns the connection configuration with the given ID" do + expect(collection.by_id(eth0.id)).to eq(eth0) + end + end + + describe "#by_ids" do + it "retuns the connection configurations with the given IDs" do + expect(collection.by_ids(eth0.id)).to eq([eth0]) + end + end + describe "#add_or_update" do let(:eth0_1) { Y2Network::ConnectionConfig::Ethernet.new.tap { |c| c.name = "eth0" } } From 81185c0298ccec133de9dc62ec9fb460db53a9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 19 Sep 2019 22:47:58 +0100 Subject: [PATCH 463/471] ConnectionConfigWriter receives the old config too --- src/lib/y2network/sysconfig/config_writer.rb | 11 ++++--- .../sysconfig/connection_config_writer.rb | 6 +++- .../y2network/sysconfig/config_writer_test.rb | 30 ++++++++++++------- .../connection_config_writer_test.rb | 13 ++++++++ 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index 2d8a64ea1..a3d101874 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -199,7 +199,10 @@ def write_connections(conns, old_config) # FIXME: this code might live in its own class writer = Y2Network::Sysconfig::ConnectionConfigWriter.new remove_old_connections(conns, old_config.connections, writer) if old_config - conns.each { |c| writer.write(c) } + conns.each do |conn| + old_conn = old_config ? old_config.connections.by_id(conn.id) : nil + writer.write(conn, old_conn) + end end # Writes drivers options @@ -215,9 +218,9 @@ def write_drivers(drivers) # @param old_conns [ConnectionConfigsCollection] Old connections # @param writer [Sysconfig::ConnectionConfigWriter] Writer instance to save changes def remove_old_connections(conns, old_conns, writer) - names_to_remove = old_conns.map(&:name) - conns.map(&:name) - to_remove = old_conns.select { |c| names_to_remove.include?(c.name) } - log.info "removing connections #{names_to_remove.inspect}" + ids_to_remove = old_conns.map(&:id) - conns.map(&:id) + to_remove = old_conns.by_ids(*ids_to_remove) + log.info "removing connections #{to_remove.map(&:name).inspect}" to_remove.each { |c| writer.remove(c) } end end diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index ddf5bb5e7..958ceb012 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -30,11 +30,15 @@ class ConnectionConfigWriter # Writes connection config to the underlying system # + # The method can receive the old configuration in order to perform clean-up tasks. + # # @param conn [Y2Network::ConnectionConfig::Base] Connection configuration to write - def write(conn) + # @param old_conn [Y2Network::ConnectionConfig::Base,nil] Connection configuration to write + def write(conn, old_conn = nil) file = Y2Network::Sysconfig::InterfaceFile.new(conn.interface) handler_class = find_handler_class(conn.type) return nil if handler_class.nil? + remove(old_conn) if old_conn file.clean handler_class.new(file).write(conn) file.save diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/sysconfig/config_writer_test.rb index 13ecb3db2..7bdef9876 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/sysconfig/config_writer_test.rb @@ -37,17 +37,24 @@ allow(Yast::Host).to receive(:Write) end - let(:config) do + let(:old_config) do Y2Network::Config.new( interfaces: Y2Network::InterfacesCollection.new([eth0]), - connections: Y2Network::ConnectionConfigsCollection.new([eth0_conn]), - routing: routing, - source: :sysconfig + connections: Y2Network::ConnectionConfigsCollection.new([old_eth0_conn]), + source: :testing ) end - let(:old_config) { Y2Network::Config.new(source: :testing) } + + let(:config) do + old_config.copy.tap do |cfg| + cfg.add_or_update_connection_config(eth0_conn) + cfg.routing = routing + end + end let(:ip) { Y2Network::ConnectionConfig::IPConfig.new(address: IPAddr.new("192.168.122.2")) } let(:eth0) { Y2Network::Interface.new("eth0") } + let(:old_eth0_conn) { eth0_conn.clone } + let(:eth0_conn) do Y2Network::ConnectionConfig::Ethernet.new.tap do |conn| conn.interface = "eth0" @@ -163,11 +170,11 @@ context "when a connection is deleted" do let(:config) do - Y2Network::Config.new( - interfaces: Y2Network::InterfacesCollection.new([eth0]), - connections: Y2Network::ConnectionConfigsCollection.new([]), - source: :testing - ) + old_config.copy.tap do |cfg| + cfg.interfaces = Y2Network::InterfacesCollection.new([eth0]) + cfg.connections = Y2Network::ConnectionConfigsCollection.new([]) + cfg.source = :testing + end end let(:old_config) do @@ -235,7 +242,8 @@ end it "writes connections configurations" do - expect_any_instance_of(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:write).with(eth0_conn) + expect_any_instance_of(Y2Network::Sysconfig::ConnectionConfigWriter) + .to receive(:write).with(eth0_conn, old_eth0_conn) writer.write(config, old_config) end diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/sysconfig/connection_config_writer_test.rb index 2ea4b4bd4..357f32656 100644 --- a/test/y2network/sysconfig/connection_config_writer_test.rb +++ b/test/y2network/sysconfig/connection_config_writer_test.rb @@ -36,6 +36,14 @@ ) end + let(:old_conn) do + instance_double( + Y2Network::ConnectionConfig::Ethernet, + interface: "eth0", + type: Y2Network::InterfaceType::ETHERNET + ) + end + let(:ip_config) do Y2Network::ConnectionConfig::IPConfig.new(Y2Network::IPAddress.from_string("10.100.0.1/24")) end @@ -72,6 +80,11 @@ expect(file).to receive(:save) writer.write(conn) end + + it "removes the old configuration if given" do + expect(writer).to receive(:remove).with(old_conn) + writer.write(conn, old_conn) + end end describe "#remove" do From a0a1454f79f01a950cc780f883eb9cf202aba68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 06:37:02 +0100 Subject: [PATCH 464/471] Do not write connection configs which has not been modified --- src/lib/y2network/sysconfig/connection_config_writer.rb | 1 + test/y2network/sysconfig/connection_config_writer_test.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index 958ceb012..dc6aa3053 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -35,6 +35,7 @@ class ConnectionConfigWriter # @param conn [Y2Network::ConnectionConfig::Base] Connection configuration to write # @param old_conn [Y2Network::ConnectionConfig::Base,nil] Connection configuration to write def write(conn, old_conn = nil) + return if conn == old_conn file = Y2Network::Sysconfig::InterfaceFile.new(conn.interface) handler_class = find_handler_class(conn.type) return nil if handler_class.nil? diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/sysconfig/connection_config_writer_test.rb index 357f32656..99abf8909 100644 --- a/test/y2network/sysconfig/connection_config_writer_test.rb +++ b/test/y2network/sysconfig/connection_config_writer_test.rb @@ -85,6 +85,11 @@ expect(writer).to receive(:remove).with(old_conn) writer.write(conn, old_conn) end + + it "does nothing if the connection has not changed" do + expect(file).to_not receive(:save) + writer.write(conn, conn) + end end describe "#remove" do From c9104388e0dfe3de40ef3099bc946961d2b29409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 09:31:40 +0100 Subject: [PATCH 465/471] Update from code review --- src/lib/y2network/boot_protocol.rb | 9 +++++++++ src/lib/y2network/connection_config/base.rb | 11 ++++------- .../y2network/connection_configs_collection.rb | 17 +++++------------ src/lib/y2network/sysconfig/config_reader.rb | 1 + src/lib/y2network/sysconfig/config_writer.rb | 3 ++- .../sysconfig/connection_config_writers/base.rb | 2 +- test/y2network/boot_protocol_test.rb | 11 +++++++++++ .../connection_configs_collection_test.rb | 8 +------- 8 files changed, 34 insertions(+), 28 deletions(-) diff --git a/src/lib/y2network/boot_protocol.rb b/src/lib/y2network/boot_protocol.rb index 8e27ff62b..d77ffd7d8 100644 --- a/src/lib/y2network/boot_protocol.rb +++ b/src/lib/y2network/boot_protocol.rb @@ -52,10 +52,19 @@ def initialize(name) end # checks if boot protocol is at least partially configured by dhcp + # + # @return [Boolean] def dhcp? [DHCP4, DHCP6, DHCP, DHCP_AUTOIP].include?(self) end + # Checks if boot protocol is static + # + # @return [Boolean] + def static? + STATIC == self + end + # Determines whether two objects are equivalent # # They are equal when they refer to the same boot protocol (through the name). diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 0d9629404..f8bb15e97 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -29,6 +29,10 @@ module ConnectionConfig # It holds a configuration (IP addresses, MTU, WIFI settings, etc.) that can be applied to an # interface. By comparison, it is the equivalent of the "Connection" concept in NetworkManager. # When it comes to sysconfig, a "ConnectionConfig" is defined using a "ifcfg-*" file. + # + # Additionally, each connection config gets an internal ID which makes easier to track changes + # between two different {Y2Network::Config} objects. When they are copied, the same IDs are + # kept, so it is easy to find out which connections have been added, removed or simply changed. class Base # A connection could belongs to a specific interface or not. In case of # no specific interface then it could be activated by the first available @@ -175,13 +179,6 @@ def find_master(configs) end end - # Returns whether the connection is configured as static - # - # @return [Boolean] return true if the connection is static; false otherwise - def static? - bootproto == BootProtocol::STATIC - end - private def replace_ifplugd? diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb index ea9ae7200..e4506d7fe 100644 --- a/src/lib/y2network/connection_configs_collection.rb +++ b/src/lib/y2network/connection_configs_collection.rb @@ -36,7 +36,8 @@ class ConnectionConfigsCollection attr_reader :connection_configs alias_method :to_a, :connection_configs - def_delegators :@connection_configs, :each, :find, :push, :<<, :reject!, :map, :flat_map, :any?, :size + def_delegators :@connection_configs, :each, :find, :push, :<<, :reject!, :map, :flat_map, + :any?, :size, :first # Constructor # @@ -61,20 +62,12 @@ def by_interface(interface_name) connection_configs.select { |c| c.interface == interface_name } end - # Returns connection with the given internal ID - # - # @param id [Integer] Internal ID - # @return [ConnectionConfig::Base] Connection config with the given ID - def by_id(id) - connection_configs.find { |c| c.id == id } - end - # Returns connections with any of the given internal IDs # - # @param ids [Integer] Internal IDs - # @return [ConnectionConfig::Base] Connection config with the given IDs + # @param ids [Array] Internal IDs + # @return [Array] Connection config with the given IDs def by_ids(*ids) - connection_configs.select { |c| ids.include?(c.id) } + select { |c| ids.include?(c.id) } end # Adds or updates a connection configuration diff --git a/src/lib/y2network/sysconfig/config_reader.rb b/src/lib/y2network/sysconfig/config_reader.rb index 6c27b3037..218d83b71 100644 --- a/src/lib/y2network/sysconfig/config_reader.rb +++ b/src/lib/y2network/sysconfig/config_reader.rb @@ -41,6 +41,7 @@ def initialize(_opts = {}) # @return [Y2Network::Config] Network configuration def config + # NOTE: This code might be moved outside of the Sysconfig namespace, as it is generic. Yast::Host.Read routing_tables = find_routing_tables(interfaces_reader.interfaces) diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/sysconfig/config_writer.rb index a3d101874..c777f80e8 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/sysconfig/config_writer.rb @@ -55,6 +55,7 @@ def write(config, old_config = nil) write_connections(config.connections, old_config) write_dns_settings(config, old_config) + # NOTE: This code might be moved outside of the Sysconfig namespace, as it is generic. Yast::Host.Write(gui: false) end @@ -200,7 +201,7 @@ def write_connections(conns, old_config) writer = Y2Network::Sysconfig::ConnectionConfigWriter.new remove_old_connections(conns, old_config.connections, writer) if old_config conns.each do |conn| - old_conn = old_config ? old_config.connections.by_id(conn.id) : nil + old_conn = old_config ? old_config.connections.by_ids(conn.id).first : nil writer.write(conn, old_conn) end end diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/sysconfig/connection_config_writers/base.rb index 874029ac8..b9e35768e 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/sysconfig/connection_config_writers/base.rb @@ -51,7 +51,7 @@ def write(conn) file.zone = conn.firewall_zone add_ips(conn) update_file(conn) - add_hostname(conn) if conn.static? + add_hostname(conn) if conn.bootproto.static? end private diff --git a/test/y2network/boot_protocol_test.rb b/test/y2network/boot_protocol_test.rb index b67921359..1badb6305 100644 --- a/test/y2network/boot_protocol_test.rb +++ b/test/y2network/boot_protocol_test.rb @@ -49,6 +49,17 @@ end end + describe "#static?" do + it "returns true for STATIC boot protocol" do + expect(Y2Network::BootProtocol::STATIC.static?).to eq(true) + end + + it "returns false for non static boot protocols" do + non_static = Y2Network::BootProtocol.all - [Y2Network::BootProtocol::STATIC] + non_static.each { |b| expect(b.static?).to eq(false) } + end + end + describe "#==" do context "when the other object refers to the same boot protocol" do it "returns true" do diff --git a/test/y2network/connection_configs_collection_test.rb b/test/y2network/connection_configs_collection_test.rb index d9370e8b9..e0fd6addf 100644 --- a/test/y2network/connection_configs_collection_test.rb +++ b/test/y2network/connection_configs_collection_test.rb @@ -52,15 +52,9 @@ end end - describe "#by_id" do - it "retuns the connection configuration with the given ID" do - expect(collection.by_id(eth0.id)).to eq(eth0) - end - end - describe "#by_ids" do it "retuns the connection configurations with the given IDs" do - expect(collection.by_ids(eth0.id)).to eq([eth0]) + expect(collection.by_ids(eth0.id)).to eq(described_class.new([eth0])) end end From 5dfecfc013214e3fb27fc7741764bfc81c5330c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 09:43:20 +0100 Subject: [PATCH 466/471] Avoid trying to remove the ifcfg-* files twice --- src/lib/y2network/sysconfig/interfaces_writer.rb | 6 +----- test/y2network/sysconfig/interfaces_writer_test.rb | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 6d3742028..82caec790 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -101,11 +101,7 @@ def reload_udev_rules # # @param interfaces [InterfacesCollection] Interfaces def clean_up_old_interfaces(interfaces) - interfaces.to_a.select(&:old_name).each do |iface| - set_interface_down(iface.old_name) - ifcfg = Y2Network::Sysconfig::InterfaceFile.find(iface.old_name) - ifcfg && ifcfg.remove - end + interfaces.to_a.select(&:old_name).each { |i| set_interface_down(i.old_name) } end # Sets the interface down diff --git a/test/y2network/sysconfig/interfaces_writer_test.rb b/test/y2network/sysconfig/interfaces_writer_test.rb index f0501ce7f..4f71f8db7 100644 --- a/test/y2network/sysconfig/interfaces_writer_test.rb +++ b/test/y2network/sysconfig/interfaces_writer_test.rb @@ -69,13 +69,6 @@ eth0.rename("eth1", renaming_mechanism) end - it "removes the old configuration files" do - ifcfg_path = File.join(scr_root, "etc", "sysconfig", "network", "ifcfg-eth0") - expect(File).to exist(ifcfg_path) - subject.write(interfaces) - expect(File).to_not exist(ifcfg_path) - end - it "sets the interface down" do expect(Yast::Execute).to receive(:on_target).with("/sbin/ifdown", "eth0") subject.write(interfaces) From 89f772b558249b7a93911efd466cd7e33141d108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 09:49:14 +0100 Subject: [PATCH 467/471] Do not crash when writing new connection configs --- src/lib/y2network/sysconfig/connection_config_writer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index dc6aa3053..c179db838 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -35,7 +35,7 @@ class ConnectionConfigWriter # @param conn [Y2Network::ConnectionConfig::Base] Connection configuration to write # @param old_conn [Y2Network::ConnectionConfig::Base,nil] Connection configuration to write def write(conn, old_conn = nil) - return if conn == old_conn + return if old_conn && conn == old_conn file = Y2Network::Sysconfig::InterfaceFile.new(conn.interface) handler_class = find_handler_class(conn.type) return nil if handler_class.nil? From df1ff03d9f48d64d4ab8ab78693b2f3264cbd8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 10:24:14 +0100 Subject: [PATCH 468/471] Update from code review --- src/lib/y2network/connection_config/base.rb | 1 + src/lib/y2network/sysconfig/connection_config_writer.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index f8bb15e97..2f5e42b0e 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -90,6 +90,7 @@ def initialize # @return [Boolean] true when both connections are same # false otherwise def ==(other) + return false if other.nil? [:name, :interface, :bootproto, :ip, :ip_aliases, :mtu, :startmode, :description, :lladdress, :ethtool_options, :firewall_zone, :hostname].all? do |method| public_send(method) == other.public_send(method) diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/sysconfig/connection_config_writer.rb index c179db838..dc6aa3053 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/sysconfig/connection_config_writer.rb @@ -35,7 +35,7 @@ class ConnectionConfigWriter # @param conn [Y2Network::ConnectionConfig::Base] Connection configuration to write # @param old_conn [Y2Network::ConnectionConfig::Base,nil] Connection configuration to write def write(conn, old_conn = nil) - return if old_conn && conn == old_conn + return if conn == old_conn file = Y2Network::Sysconfig::InterfaceFile.new(conn.interface) handler_class = find_handler_class(conn.type) return nil if handler_class.nil? From f36491d044857400215ec14a5e017b9a7152785a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 10:51:04 +0100 Subject: [PATCH 469/471] Update from code review --- src/lib/y2network/connection_config/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/y2network/connection_config/base.rb b/src/lib/y2network/connection_config/base.rb index 2f5e42b0e..b24860b44 100644 --- a/src/lib/y2network/connection_config/base.rb +++ b/src/lib/y2network/connection_config/base.rb @@ -90,7 +90,7 @@ def initialize # @return [Boolean] true when both connections are same # false otherwise def ==(other) - return false if other.nil? + return false if self.class != other.class [:name, :interface, :bootproto, :ip, :ip_aliases, :mtu, :startmode, :description, :lladdress, :ethtool_options, :firewall_zone, :hostname].all? do |method| public_send(method) == other.public_send(method) From 188d4402a85604de9da20484fcd68e5cd9dd2ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 11:17:20 +0100 Subject: [PATCH 470/471] InterfaceFile.all filters nil values --- src/lib/y2network/sysconfig/interface_file.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/y2network/sysconfig/interface_file.rb b/src/lib/y2network/sysconfig/interface_file.rb index bc21794b8..fc04c79dc 100644 --- a/src/lib/y2network/sysconfig/interface_file.rb +++ b/src/lib/y2network/sysconfig/interface_file.rb @@ -65,6 +65,7 @@ def all Yast::SCR.Dir(Yast::Path.new(".network.section")) .reject { |f| IGNORE_IFCFG_REGEX =~ f || f == "lo" } .map { |f| find(f) } + .compact end # Finds the ifcfg-* file for a given interface From c2f84003d82394ccb0e285c43fab04f2914139ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Fri, 20 Sep 2019 11:26:36 +0100 Subject: [PATCH 471/471] Improve private method name (set_old_interfaces_down) --- src/lib/y2network/sysconfig/interfaces_writer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/y2network/sysconfig/interfaces_writer.rb b/src/lib/y2network/sysconfig/interfaces_writer.rb index 82caec790..0458290e6 100644 --- a/src/lib/y2network/sysconfig/interfaces_writer.rb +++ b/src/lib/y2network/sysconfig/interfaces_writer.rb @@ -38,7 +38,7 @@ class InterfacesWriter # # @param interfaces [Y2Network::InterfacesCollection] Interfaces collection def write(interfaces) - clean_up_old_interfaces(interfaces) + set_old_interfaces_down(interfaces) update_udevd(interfaces) end @@ -100,7 +100,7 @@ def reload_udev_rules # Cleans and shutdowns renamed interfaces # # @param interfaces [InterfacesCollection] Interfaces - def clean_up_old_interfaces(interfaces) + def set_old_interfaces_down(interfaces) interfaces.to_a.select(&:old_name).each { |i| set_interface_down(i.old_name) } end