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