From b6b77b79d97ff1149e2f8f2958b581fbff51bc66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 21 Jan 2021 07:36:04 +0000 Subject: [PATCH 1/2] Clear hosts list after HostAuto tests --- test/host_auto_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/host_auto_test.rb b/test/host_auto_test.rb index 0ae6a4eeb..1f2029db7 100755 --- a/test/host_auto_test.rb +++ b/test/host_auto_test.rb @@ -41,6 +41,10 @@ allow(Yast::WFM).to receive(:Args).with(1).and_return(hosts) end + after do + Yast::Host.clear + end + context "when func is Import" do let(:func) { "Import" } let(:i_list) { double("IssuesList", add: nil) } From 6984f50c02ecc32340f05cb433239062377e33d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= Date: Thu, 21 Jan 2021 07:42:07 +0000 Subject: [PATCH 2/2] Rename "sysconfig" backend to "wicked" * It is a step in order to unify the concept of "backend" and "source". --- doc/network-ng.md | 22 ++++++++-------- examples/connection.rb | 2 +- src/include/network/lan/complex.rb | 2 +- src/lib/y2network/autoinst/config_reader.rb | 2 +- src/lib/y2network/autoinst/hostname_reader.rb | 6 ++--- src/lib/y2network/clients/routing.rb | 6 ++--- src/lib/y2network/config.rb | 6 ++--- src/lib/y2network/config_reader.rb | 4 +-- src/lib/y2network/config_writer.rb | 2 +- .../dialogs/s390_device_activation.rb | 4 +-- src/lib/y2network/hostname.rb | 2 +- .../{sysconfig => wicked}/config_reader.rb | 16 ++++++------ .../{sysconfig => wicked}/config_writer.rb | 8 +++--- .../connection_config_reader.rb | 4 +-- .../connection_config_readers/base.rb | 2 +- .../connection_config_readers/bonding.rb | 6 ++--- .../connection_config_readers/bridge.rb | 6 ++--- .../connection_config_readers/ctc.rb | 6 ++--- .../connection_config_readers/dummy.rb | 6 ++--- .../connection_config_readers/ethernet.rb | 8 +++--- .../connection_config_readers/hsi.rb | 6 ++--- .../connection_config_readers/infiniband.rb | 6 ++--- .../connection_config_readers/lcs.rb | 6 ++--- .../connection_config_readers/qeth.rb | 6 ++--- .../connection_config_readers/tap.rb | 8 +++--- .../connection_config_readers/tun.rb | 8 +++--- .../connection_config_readers/usb.rb | 6 ++--- .../connection_config_readers/vlan.rb | 6 ++--- .../connection_config_readers/wireless.rb | 8 +++--- .../connection_config_writer.rb | 4 +-- .../connection_config_writers/base.rb | 2 +- .../connection_config_writers/bonding.rb | 4 +-- .../connection_config_writers/bridge.rb | 4 +-- .../connection_config_writers/ctc.rb | 4 +-- .../connection_config_writers/dummy.rb | 4 +-- .../connection_config_writers/ethernet.rb | 4 +-- .../connection_config_writers/hsi.rb | 4 +-- .../connection_config_writers/infiniband.rb | 4 +-- .../connection_config_writers/lcs.rb | 4 +-- .../connection_config_writers/qeth.rb | 4 +-- .../connection_config_writers/tap.rb | 4 +-- .../connection_config_writers/tun.rb | 4 +-- .../connection_config_writers/usb.rb | 4 +-- .../connection_config_writers/vlan.rb | 4 +-- .../connection_config_writers/wireless.rb | 4 +-- .../{sysconfig => wicked}/dns_reader.rb | 2 +- .../{sysconfig => wicked}/hostname_reader.rb | 2 +- .../interfaces_reader.rb | 6 ++--- .../{sysconfig => wicked}/type_detector.rb | 2 +- src/modules/DNS.rb | 2 +- src/modules/Lan.rb | 4 +-- test/dns_test.rb | 2 +- test/host_test.rb | 4 +-- test/lan_test.rb | 2 +- test/network_autoconfiguration_test.rb | 2 +- test/network_autoyast_test.rb | 4 +-- test/save_network_test.rb | 4 +-- test/y2network/autoinst/config_reader_test.rb | 2 +- test/y2network/autoinst/dns_reader_test.rb | 6 ++--- .../autoinst/hostname_reader_test.rb | 4 +-- .../networking_section_test.rb | 2 +- test/y2network/clients/auto_test.rb | 2 +- test/y2network/clients/dns_test.rb | 2 +- test/y2network/clients/routing_test.rb | 2 +- test/y2network/config_reader_test.rb | 4 +-- test/y2network/config_test.rb | 24 ++++++++--------- test/y2network/config_writer_test.rb | 4 +-- .../interface_config_builder_test.rb | 2 +- .../infiniband_test.rb | 2 +- .../config_reader_test.rb | 26 +++++++++---------- .../config_writer_test.rb | 14 +++++----- .../connection_config_reader_test.rb | 12 ++++----- .../connection_config_readers/bonding_test.rb | 4 +-- .../connection_config_readers/bridge_test.rb | 4 +-- .../connection_config_readers/ctc_test.rb | 4 +-- .../connection_config_readers/dummy_test.rb | 4 +-- .../ethernet_test.rb | 4 +-- .../connection_config_readers/hsi_test.rb | 4 +-- .../infiniband_test.rb | 4 +-- .../connection_config_readers/lcs_test.rb | 4 +-- .../connection_config_readers/qeth_test.rb | 4 +-- .../connection_config_readers/tap_test.rb | 4 +-- .../connection_config_readers/tun_test.rb | 4 +-- .../connection_config_readers/usb_test.rb | 4 +-- .../connection_config_readers/vlan_test.rb | 4 +-- .../wireless_test.rb | 4 +-- .../connection_config_writer_test.rb | 10 +++---- .../connection_config_writers/bonding_test.rb | 4 +-- .../connection_config_writers/bridge_test.rb | 4 +-- .../connection_config_writers/ctc_test.rb | 4 +-- .../connection_config_writers/dummy_test.rb | 4 +-- .../ethernet_test.rb | 4 +-- .../connection_config_writers/hsi_test.rb | 4 +-- .../infiniband_test.rb | 4 +-- .../connection_config_writers/lcs_test.rb | 4 +-- .../connection_config_writers/qeth_test.rb | 4 +-- .../connection_config_writers/tap_test.rb | 4 +-- .../connection_config_writers/tun_test.rb | 4 +-- .../connection_config_writers/usb_test.rb | 4 +-- .../connection_config_writers/vlan_test.rb | 4 +-- .../wireless_test.rb | 4 +-- .../{sysconfig => wicked}/dns_reader_test.rb | 10 +++---- .../hostname_reader_test.rb | 4 +-- .../interfaces_reader_test.rb | 4 +-- test/y2network/widgets/edit_interface_test.rb | 2 +- test/y2network/widgets/ip4_forwarding_test.rb | 2 +- test/y2network/widgets/ip6_forwarding_test.rb | 2 +- 107 files changed, 266 insertions(+), 266 deletions(-) rename src/lib/y2network/{sysconfig => wicked}/config_reader.rb (92%) rename src/lib/y2network/{sysconfig => wicked}/config_writer.rb (96%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_reader.rb (95%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/base.rb (99%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/bonding.rb (88%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/bridge.rb (87%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/ctc.rb (93%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/dummy.rb (88%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/ethernet.rb (82%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/hsi.rb (88%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/infiniband.rb (87%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/lcs.rb (88%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/qeth.rb (95%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/tap.rb (84%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/tun.rb (84%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/usb.rb (88%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/vlan.rb (89%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_readers/wireless.rb (92%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writer.rb (96%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/base.rb (99%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/bonding.rb (95%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/bridge.rb (94%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/ctc.rb (92%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/dummy.rb (94%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/ethernet.rb (93%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/hsi.rb (92%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/infiniband.rb (93%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/lcs.rb (92%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/qeth.rb (92%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/tap.rb (93%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/tun.rb (93%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/usb.rb (92%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/vlan.rb (94%) rename src/lib/y2network/{sysconfig => wicked}/connection_config_writers/wireless.rb (97%) rename src/lib/y2network/{sysconfig => wicked}/dns_reader.rb (99%) rename src/lib/y2network/{sysconfig => wicked}/hostname_reader.rb (99%) rename src/lib/y2network/{sysconfig => wicked}/interfaces_reader.rb (98%) rename src/lib/y2network/{sysconfig => wicked}/type_detector.rb (98%) rename test/y2network/{sysconfig => wicked}/config_reader_test.rb (81%) rename test/y2network/{sysconfig => wicked}/config_writer_test.rb (93%) rename test/y2network/{sysconfig => wicked}/connection_config_reader_test.rb (84%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/bonding_test.rb (91%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/bridge_test.rb (91%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/ctc_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/dummy_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/ethernet_test.rb (95%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/hsi_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/infiniband_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/lcs_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/qeth_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/tap_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/tun_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/usb_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/vlan_test.rb (94%) rename test/y2network/{sysconfig => wicked}/connection_config_readers/wireless_test.rb (96%) rename test/y2network/{sysconfig => wicked}/connection_config_writer_test.rb (91%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/bonding_test.rb (93%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/bridge_test.rb (93%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/ctc_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/dummy_test.rb (94%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/ethernet_test.rb (96%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/hsi_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/infiniband_test.rb (93%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/lcs_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/qeth_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/tap_test.rb (94%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/tun_test.rb (94%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/usb_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/vlan_test.rb (92%) rename test/y2network/{sysconfig => wicked}/connection_config_writers/wireless_test.rb (97%) rename test/y2network/{sysconfig => wicked}/dns_reader_test.rb (90%) rename test/y2network/{sysconfig => wicked}/hostname_reader_test.rb (98%) rename test/y2network/{sysconfig => wicked}/interfaces_reader_test.rb (98%) diff --git a/doc/network-ng.md b/doc/network-ng.md index 35c994fc6..66390d4a3 100644 --- a/doc/network-ng.md +++ b/doc/network-ng.md @@ -25,7 +25,7 @@ written in the 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. +to support. At this point of time, only `Wicked` and `Autoinst` are supported. ### The Configuration Classes @@ -59,11 +59,11 @@ 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 +#### Wicked -The sysconfig backend support is composed by these files: +The Wicked backend support is composed by these files: - src/lib/y2network/sysconfig + src/lib/y2network/wicked ├── config_reader.rb <- READER ├── config_writer.rb <- WRITER ├── connection_config_reader.rb @@ -79,19 +79,19 @@ The sysconfig backend support is composed by these files: ├── dns_reader.rb └── interfaces_reader.rb -{Y2Network::Sysconfig::ConfigReader} and {Y2Network::Sysconfig::ConfigWriter} are the reader and +{Y2Network::Wicked::ConfigReader} and {Y2Network::Wicked::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 +{Y2Network::Wicked::DNSReader}, {Y2Network::Wicked::InterfacesReader} and +{Y2Network::Wicked::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::Wicked::ConnectionConfigReaders}. {Y2Network::ConfigWriters::InterfacesWriter}, {Y2Network::ConfigWriters::DNSWriter} and -{Y2Network::Sysconfig::ConnectionConfigWriter}, including smaller classes under -{Y2Network::Sysconfig::ConnectionConfigWriters}, are involved in writing the configuration. +{Y2Network::Wicked::ConnectionConfigWriter}, including smaller classes under +{Y2Network::Wicked::ConnectionConfigWriters}, are involved in writing the configuration. Last but not least, there are additional classes like {CFA::RoutesFile} and {CFA::InterfaceFile} which abstract the details of reading/writing `ifroute` and `ifcfg` files. @@ -100,7 +100,7 @@ which abstract the details of reading/writing `ifroute` and `ifcfg` files. 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`). +configuration will be written using a different backend (like `wicked`). src/lib/y2network/autoinst/ ├── config_reader.rb diff --git a/examples/connection.rb b/examples/connection.rb index 75009be9a..c568a0436 100644 --- a/examples/connection.rb +++ b/examples/connection.rb @@ -43,7 +43,7 @@ # given an interfaces list (interfaces) -config = Y2Network::Config.from(:sysconfig) +config = Y2Network::Config.from(:wicked) eth0 = config.interfaces.by_name("eth0") eth_conn = Y2Network::ConnectionConfig::Ethernet.new diff --git a/src/include/network/lan/complex.rb b/src/include/network/lan/complex.rb index cfa82bbee..7ec86c478 100644 --- a/src/include/network/lan/complex.rb +++ b/src/include/network/lan/complex.rb @@ -175,7 +175,7 @@ def ReadDialog # Currently just a smoketest for new config storage - # something what should replace Lan module in the bright future # TODO: find a suitable place for this config storage - Y2Network::Config.from(:sysconfig) + Y2Network::Config.from(:wicked) if Lan.HaveXenBridge if !Popup.ContinueCancel( diff --git a/src/lib/y2network/autoinst/config_reader.rb b/src/lib/y2network/autoinst/config_reader.rb index bfc13348d..baf5cc3ff 100644 --- a/src/lib/y2network/autoinst/config_reader.rb +++ b/src/lib/y2network/autoinst/config_reader.rb @@ -26,7 +26,7 @@ require "y2network/autoinst/interfaces_reader" require "y2network/autoinst/udev_rules_reader" require "y2network/autoinst_profile/networking_section" -require "y2network/sysconfig/interfaces_reader" +require "y2network/wicked/interfaces_reader" Yast.import "Lan" diff --git a/src/lib/y2network/autoinst/hostname_reader.rb b/src/lib/y2network/autoinst/hostname_reader.rb index 689626182..fb685d46a 100644 --- a/src/lib/y2network/autoinst/hostname_reader.rb +++ b/src/lib/y2network/autoinst/hostname_reader.rb @@ -19,7 +19,7 @@ require "yast" require "y2network/hostname" -require "y2network/sysconfig/hostname_reader" +require "y2network/wicked/hostname_reader" module Y2Network module Autoinst @@ -51,7 +51,7 @@ def config # # @return [String] def static_hostname - Y2Network::Sysconfig::HostnameReader.new.static_hostname + Y2Network::Wicked::HostnameReader.new.static_hostname end # Returns the value for the dhcp_hostname option selected in the profile. @@ -63,7 +63,7 @@ def dhcp_hostname_for(section_value) # config, but we do not want to override current config if the value is # not present and the merge is missing for whatever reason, for example # in case AutoYaST is called in config mode - return Y2Network::Sysconfig::HostnameReader.new.dhcp_hostname if section_value.nil? + return Y2Network::Wicked::HostnameReader.new.dhcp_hostname if section_value.nil? section_value ? :any : :none end diff --git a/src/lib/y2network/clients/routing.rb b/src/lib/y2network/clients/routing.rb index 00293977a..0d9bc3cf0 100644 --- a/src/lib/y2network/clients/routing.rb +++ b/src/lib/y2network/clients/routing.rb @@ -30,7 +30,7 @@ require "yast" require "y2network/config" -require "y2network/sysconfig/config_writer" +require "y2network/wicked/config_writer" require "y2network/serializer/route_sysconfig" Yast.import "Lan" @@ -342,7 +342,7 @@ def DeleteHandler(options) # # @return [Boolean] def read - system_config = Y2Network::Config.from(:sysconfig) + system_config = Y2Network::Config.from(:wicked) Yast::Lan.add_config(:system, system_config) Yast::Lan.add_config(:yast, system_config.copy) @@ -354,7 +354,7 @@ def read # @return [Boolean] def write if modified? - Y2Network::Sysconfig::ConfigWriter.new.write(yast_config) + Y2Network::Wicked::ConfigWriter.new.write(yast_config) log.info("Writing routing configuration: #{yast_config.routing.inspect}") end diff --git a/src/lib/y2network/config.rb b/src/lib/y2network/config.rb index 715eb91c8..d263992bc 100644 --- a/src/lib/y2network/config.rb +++ b/src/lib/y2network/config.rb @@ -33,11 +33,11 @@ module Y2Network # routes, etc. # # @example Reading from wicked - # config = Y2Network::Config.from(:sysconfig) + # config = Y2Network::Config.from(:wicked) # config.interfaces.map(&:name) #=> ["lo", eth0", "wlan0"] # # @example Adding a default route to the first routing table - # config = Y2Network::Config.from(:sysconfig) + # config = Y2Network::Config.from(:wicked) # route = Y2Network::Route.new(to: :default) # config.routing.tables.first << route # config.write @@ -131,7 +131,7 @@ def initialize(source:, **opts) # is provided # # @param original [Y2Network::Config] configuration used for detecting changes - # @param target [Symbol] Target to write the configuration to (:sysconfig) + # @param target [Symbol] Target to write the configuration to (:wicked) # @param only [Array, nil] explicit sections to be written, by default if no # parameter is given then all changes will be written. # diff --git a/src/lib/y2network/config_reader.rb b/src/lib/y2network/config_reader.rb index 81a2d9e53..7a8cead3d 100644 --- a/src/lib/y2network/config_reader.rb +++ b/src/lib/y2network/config_reader.rb @@ -20,9 +20,9 @@ module Y2Network module ConfigReader # Config reader for a given source # - # @param source [Symbol] Source name (e.g., :sysconfig) + # @param source [Symbol] Source name (e.g., :wicked) # @param opts [Array] Reader options - # @return [Y2Network::Autoinst::ConfigReader,Y2Network::Sysconfig::ConfigReader] + # @return [Y2Network::Autoinst::ConfigReader,Y2Network::Wicked::ConfigReader] def self.for(source, *opts) require "y2network/#{source}/config_reader" modname = source.to_s.split("_").map(&:capitalize).join diff --git a/src/lib/y2network/config_writer.rb b/src/lib/y2network/config_writer.rb index c43232049..7d874ff22 100644 --- a/src/lib/y2network/config_writer.rb +++ b/src/lib/y2network/config_writer.rb @@ -43,7 +43,7 @@ class ConfigWriter class << self # Returns a configuration writer for a given source # - # @param source [Symbol] Source name (e.g., :sysconfig) + # @param source [Symbol] Source name (e.g., :wicked) # @return [Y2Network::ConfigWriters::ConfigWriter] # # @see Y2Network::ConfigWriters::ConfigWriter diff --git a/src/lib/y2network/dialogs/s390_device_activation.rb b/src/lib/y2network/dialogs/s390_device_activation.rb index 71b0ee88a..a33e3a88e 100644 --- a/src/lib/y2network/dialogs/s390_device_activation.rb +++ b/src/lib/y2network/dialogs/s390_device_activation.rb @@ -21,7 +21,7 @@ require "y2network/s390_device_activator" require "y2network/widgets/s390_common" require "y2network/widgets/s390_channels" -require "y2network/sysconfig/interfaces_reader" +require "y2network/wicked/interfaces_reader" require "yast2/popup" Yast.import "Lan" @@ -117,7 +117,7 @@ def show_activation_error(message) end def reader - @reader ||= Y2Network::Sysconfig::InterfacesReader.new + @reader ||= Y2Network::Wicked::InterfacesReader.new end def config diff --git a/src/lib/y2network/hostname.rb b/src/lib/y2network/hostname.rb index 40ba7b4e5..9236b6159 100644 --- a/src/lib/y2network/hostname.rb +++ b/src/lib/y2network/hostname.rb @@ -18,7 +18,7 @@ # find current contact information at www.suse.com. require "yast" -require "y2network/sysconfig/hostname_reader" +require "y2network/wicked/hostname_reader" Yast.import "Stage" diff --git a/src/lib/y2network/sysconfig/config_reader.rb b/src/lib/y2network/wicked/config_reader.rb similarity index 92% rename from src/lib/y2network/sysconfig/config_reader.rb rename to src/lib/y2network/wicked/config_reader.rb index 2a710c830..6fb91095c 100644 --- a/src/lib/y2network/sysconfig/config_reader.rb +++ b/src/lib/y2network/wicked/config_reader.rb @@ -23,16 +23,16 @@ require "y2network/routing" require "y2network/routing_table" require "cfa/routes_file" -require "y2network/sysconfig/dns_reader" -require "y2network/sysconfig/hostname_reader" -require "y2network/sysconfig/interfaces_reader" +require "y2network/wicked/dns_reader" +require "y2network/wicked/hostname_reader" +require "y2network/wicked/interfaces_reader" require "y2network/interfaces_collection" Yast.import "NetworkInterfaces" Yast.import "Host" module Y2Network - module Sysconfig + module Wicked # This class reads the current configuration from `/etc/sysconfig` files class ConfigReader include Yast::Logger @@ -60,7 +60,7 @@ def config routing: routing, dns: dns, hostname: hostname, - source: :sysconfig + source: :wicked ) log.info "Sysconfig reader result: #{result.inspect}" @@ -73,7 +73,7 @@ def config # # @return [SysconfigInterfaces] Interfaces reader def interfaces_reader - @interfaces_reader ||= Y2Network::Sysconfig::InterfacesReader.new + @interfaces_reader ||= Y2Network::Wicked::InterfacesReader.new end # Reads routes @@ -127,14 +127,14 @@ def link_routes_to_interfaces(routes, interfaces) # # @return [Y2Network::DNS] def dns - Y2Network::Sysconfig::DNSReader.new.config + Y2Network::Wicked::DNSReader.new.config end # Returns the Hostname configuration # # @return [Y2Network::Hostname] def hostname - Y2Network::Sysconfig::HostnameReader.new.config + Y2Network::Wicked::HostnameReader.new.config end # Returns the Sysctl_Config file class diff --git a/src/lib/y2network/sysconfig/config_writer.rb b/src/lib/y2network/wicked/config_writer.rb similarity index 96% rename from src/lib/y2network/sysconfig/config_writer.rb rename to src/lib/y2network/wicked/config_writer.rb index d53524146..8c23cb60b 100644 --- a/src/lib/y2network/sysconfig/config_writer.rb +++ b/src/lib/y2network/wicked/config_writer.rb @@ -21,11 +21,11 @@ require "y2network/config" require "cfa/routes_file" require "y2network/config_writer" -require "y2network/sysconfig/connection_config_writer" +require "y2network/wicked/connection_config_writer" require "cfa/sysctl_config" module Y2Network - module Sysconfig + module Wicked # This class configures Wicked (through sysconfig) according to a given configuration class ConfigWriter < Y2Network::ConfigWriter private # rubocop:disable Layout/IndentationWidth @@ -122,7 +122,7 @@ def routes_file_for(iface) # @param old_config [Y2Network::Config,nil] Config object with original configuration def write_connections(config, old_config) # FIXME: this code might live in its own class - writer = Y2Network::Sysconfig::ConnectionConfigWriter.new + writer = Y2Network::Wicked::ConnectionConfigWriter.new remove_old_connections(config.connections, old_config.connections, writer) if old_config config.connections.each do |conn| old_conn = old_config ? old_config.connections.by_ids(conn.id).first : nil @@ -134,7 +134,7 @@ def write_connections(config, old_config) # # @param conns [ConnectionConfigsCollection] New connections # @param old_conns [ConnectionConfigsCollection] Old connections - # @param writer [Sysconfig::ConnectionConfigWriter] Writer instance to save changes + # @param writer [Wicked::ConnectionConfigWriter] Writer instance to save changes def remove_old_connections(conns, old_conns, writer) ids_to_remove = old_conns.map(&:id) - conns.map(&:id) to_remove = old_conns.by_ids(*ids_to_remove) diff --git a/src/lib/y2network/sysconfig/connection_config_reader.rb b/src/lib/y2network/wicked/connection_config_reader.rb similarity index 95% rename from src/lib/y2network/sysconfig/connection_config_reader.rb rename to src/lib/y2network/wicked/connection_config_reader.rb index 031dc53a3..17bf082da 100644 --- a/src/lib/y2network/sysconfig/connection_config_reader.rb +++ b/src/lib/y2network/wicked/connection_config_reader.rb @@ -20,7 +20,7 @@ require "cfa/interface_file" module Y2Network - module Sysconfig + module Wicked # Reads a connection configuration for a given interface class ConnectionConfigReader include Yast::Logger @@ -55,7 +55,7 @@ def find_handler_class(type) raise "Unknown type #{type.inspect} #{type.class.inspect}" type = t end - require "y2network/sysconfig/connection_config_readers/#{type.file_name}" + require "y2network/wicked/connection_config_readers/#{type.file_name}" ConnectionConfigReaders.const_get(type.class_name) rescue LoadError, NameError => e log.info "Unknown connection type: '#{type}'. " \ diff --git a/src/lib/y2network/sysconfig/connection_config_readers/base.rb b/src/lib/y2network/wicked/connection_config_readers/base.rb similarity index 99% rename from src/lib/y2network/sysconfig/connection_config_readers/base.rb rename to src/lib/y2network/wicked/connection_config_readers/base.rb index 596944110..7e0c59d53 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/base.rb +++ b/src/lib/y2network/wicked/connection_config_readers/base.rb @@ -25,7 +25,7 @@ Yast.import "Host" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This is the base class for connection config readers. # diff --git a/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb b/src/lib/y2network/wicked/connection_config_readers/bonding.rb similarity index 88% rename from src/lib/y2network/sysconfig/connection_config_readers/bonding.rb rename to src/lib/y2network/wicked/connection_config_readers/bonding.rb index b8461eff7..7773efe8c 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/bonding.rb +++ b/src/lib/y2network/wicked/connection_config_readers/bonding.rb @@ -17,15 +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/sysconfig/connection_config_readers/base" +require "y2network/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Bonding object given a # SysconfigInterfaceFile object. class Bonding < Base - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.slaves = slaves conn.options = file.bonding_module_opts diff --git a/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb b/src/lib/y2network/wicked/connection_config_readers/bridge.rb similarity index 87% rename from src/lib/y2network/sysconfig/connection_config_readers/bridge.rb rename to src/lib/y2network/wicked/connection_config_readers/bridge.rb index 516449747..558b84d83 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/bridge.rb +++ b/src/lib/y2network/wicked/connection_config_readers/bridge.rb @@ -17,15 +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/sysconfig/connection_config_readers/base" +require "y2network/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Bridge object given a # SysconfigInterfaceFile object. class Bridge < Base - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.ports = file.bridge_ports ? file.bridge_ports.split(" ") : [] conn.stp = file.bridge_stp == "on" diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb b/src/lib/y2network/wicked/connection_config_readers/ctc.rb similarity index 93% rename from src/lib/y2network/sysconfig/connection_config_readers/ctc.rb rename to src/lib/y2network/wicked/connection_config_readers/ctc.rb index 7da4a2d89..99706b0f1 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/ctc.rb +++ b/src/lib/y2network/wicked/connection_config_readers/ctc.rb @@ -17,13 +17,13 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Ctc object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Ctc < Base LIST_CMD = "/sbin/lszdev".freeze diff --git a/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb b/src/lib/y2network/wicked/connection_config_readers/dummy.rb similarity index 88% rename from src/lib/y2network/sysconfig/connection_config_readers/dummy.rb rename to src/lib/y2network/wicked/connection_config_readers/dummy.rb index 8cf54a7ed..a7c64183f 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/dummy.rb +++ b/src/lib/y2network/wicked/connection_config_readers/dummy.rb @@ -17,13 +17,13 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Dummy object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Dummy < Base end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb b/src/lib/y2network/wicked/connection_config_readers/ethernet.rb similarity index 82% rename from src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb rename to src/lib/y2network/wicked/connection_config_readers/ethernet.rb index 06f84369b..1f2d47765 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/ethernet.rb +++ b/src/lib/y2network/wicked/connection_config_readers/ethernet.rb @@ -17,15 +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/sysconfig/connection_config_readers/base" +require "y2network/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Ethernet object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Ethernet < Base - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(_conn); end end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb b/src/lib/y2network/wicked/connection_config_readers/hsi.rb similarity index 88% rename from src/lib/y2network/sysconfig/connection_config_readers/hsi.rb rename to src/lib/y2network/wicked/connection_config_readers/hsi.rb index ff39ce9cf..e0f8c125e 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/hsi.rb +++ b/src/lib/y2network/wicked/connection_config_readers/hsi.rb @@ -17,13 +17,13 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Hsi object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Hsi < Base end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb b/src/lib/y2network/wicked/connection_config_readers/infiniband.rb similarity index 87% rename from src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb rename to src/lib/y2network/wicked/connection_config_readers/infiniband.rb index 74c56c037..a3eef1400 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/infiniband.rb +++ b/src/lib/y2network/wicked/connection_config_readers/infiniband.rb @@ -17,17 +17,17 @@ # 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/wicked/connection_config_readers/base" require "y2network/ipoib_mode" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Infiniband object given a # SysconfigInterfaceFile object. class Infiniband < Base # @param conn [Y2Network::ConnectionConfig::Infiniband] - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.ipoib_mode = IpoibMode.from_name(file.ipoib_mode.to_s) end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb b/src/lib/y2network/wicked/connection_config_readers/lcs.rb similarity index 88% rename from src/lib/y2network/sysconfig/connection_config_readers/lcs.rb rename to src/lib/y2network/wicked/connection_config_readers/lcs.rb index 9b7a50a6b..069836b74 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/lcs.rb +++ b/src/lib/y2network/wicked/connection_config_readers/lcs.rb @@ -17,13 +17,13 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Lcs object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Lcs < Base end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb b/src/lib/y2network/wicked/connection_config_readers/qeth.rb similarity index 95% rename from src/lib/y2network/sysconfig/connection_config_readers/qeth.rb rename to src/lib/y2network/wicked/connection_config_readers/qeth.rb index a0c9afd06..d3d5fef31 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/qeth.rb +++ b/src/lib/y2network/wicked/connection_config_readers/qeth.rb @@ -17,13 +17,13 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Qeth object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Qeth < Base LIST_CMD = "/sbin/lszdev".freeze diff --git a/src/lib/y2network/sysconfig/connection_config_readers/tap.rb b/src/lib/y2network/wicked/connection_config_readers/tap.rb similarity index 84% rename from src/lib/y2network/sysconfig/connection_config_readers/tap.rb rename to src/lib/y2network/wicked/connection_config_readers/tap.rb index b28a5fa08..13433213b 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/tap.rb +++ b/src/lib/y2network/wicked/connection_config_readers/tap.rb @@ -17,16 +17,16 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Tap object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Tap < Base # @param conn [Y2Network::ConnectionConfig::Tap] - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.owner = file.tunnel_set_owner conn.group = file.tunnel_set_group diff --git a/src/lib/y2network/sysconfig/connection_config_readers/tun.rb b/src/lib/y2network/wicked/connection_config_readers/tun.rb similarity index 84% rename from src/lib/y2network/sysconfig/connection_config_readers/tun.rb rename to src/lib/y2network/wicked/connection_config_readers/tun.rb index 51ca3c016..e0d90c9af 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/tun.rb +++ b/src/lib/y2network/wicked/connection_config_readers/tun.rb @@ -17,16 +17,16 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Tun object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Tun < Base # @param conn [Y2Network::ConnectionConfig::Tun] - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.owner = file.tunnel_set_owner conn.group = file.tunnel_set_group diff --git a/src/lib/y2network/sysconfig/connection_config_readers/usb.rb b/src/lib/y2network/wicked/connection_config_readers/usb.rb similarity index 88% rename from src/lib/y2network/sysconfig/connection_config_readers/usb.rb rename to src/lib/y2network/wicked/connection_config_readers/usb.rb index 19d03a9b5..4bfb22923 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/usb.rb +++ b/src/lib/y2network/wicked/connection_config_readers/usb.rb @@ -17,13 +17,13 @@ # 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/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Usb object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Usb < Base end end diff --git a/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb b/src/lib/y2network/wicked/connection_config_readers/vlan.rb similarity index 89% rename from src/lib/y2network/sysconfig/connection_config_readers/vlan.rb rename to src/lib/y2network/wicked/connection_config_readers/vlan.rb index 93754f915..9885ae074 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb +++ b/src/lib/y2network/wicked/connection_config_readers/vlan.rb @@ -17,17 +17,17 @@ # 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/wicked/connection_config_readers/base" require "y2network/connection_config/vlan" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Vlan object given a # SysconfigInterfaceFile object. class Vlan < Base # @param conn [Y2Network::ConnectionConfig::Vlan] - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.parent_device = file.etherdevice conn.vlan_id = vlan_id_for(file) diff --git a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb b/src/lib/y2network/wicked/connection_config_readers/wireless.rb similarity index 92% rename from src/lib/y2network/sysconfig/connection_config_readers/wireless.rb rename to src/lib/y2network/wicked/connection_config_readers/wireless.rb index 37f957f7d..3c4a96252 100644 --- a/src/lib/y2network/sysconfig/connection_config_readers/wireless.rb +++ b/src/lib/y2network/wicked/connection_config_readers/wireless.rb @@ -17,15 +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/sysconfig/connection_config_readers/base" +require "y2network/wicked/connection_config_readers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigReaders # This class is able to build a ConnectionConfig::Wireless object given a - # Sysconfig::InterfaceFile object. + # Wicked::InterfaceFile object. class Wireless < Base - # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config + # @see Y2Network::Wicked::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.ap = file.wireless_ap conn.ap_scanmode = file.wireless_ap_scanmode diff --git a/src/lib/y2network/sysconfig/connection_config_writer.rb b/src/lib/y2network/wicked/connection_config_writer.rb similarity index 96% rename from src/lib/y2network/sysconfig/connection_config_writer.rb rename to src/lib/y2network/wicked/connection_config_writer.rb index 017e5592a..ea12ee493 100644 --- a/src/lib/y2network/sysconfig/connection_config_writer.rb +++ b/src/lib/y2network/wicked/connection_config_writer.rb @@ -24,7 +24,7 @@ Yast.import "Mode" module Y2Network - module Sysconfig + module Wicked # This class is responsible for writing interfaces changes class ConnectionConfigWriter include Yast::Logger @@ -67,7 +67,7 @@ def remove(conn) # @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.file_name}" + require "y2network/wicked/connection_config_writers/#{type.file_name}" ConnectionConfigWriters.const_get(type.class_name) rescue LoadError, NameError => e log.info "Unknown connection type: '#{type}'. " \ diff --git a/src/lib/y2network/sysconfig/connection_config_writers/base.rb b/src/lib/y2network/wicked/connection_config_writers/base.rb similarity index 99% rename from src/lib/y2network/sysconfig/connection_config_writers/base.rb rename to src/lib/y2network/wicked/connection_config_writers/base.rb index a439f7bf4..65f357e41 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/base.rb +++ b/src/lib/y2network/wicked/connection_config_writers/base.rb @@ -20,7 +20,7 @@ require "y2network/connection_config/ip_config" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This is the base class for connection config writers. # diff --git a/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb b/src/lib/y2network/wicked/connection_config_writers/bonding.rb similarity index 95% rename from src/lib/y2network/sysconfig/connection_config_writers/bonding.rb rename to src/lib/y2network/wicked/connection_config_writers/bonding.rb index 060a26a96..f50938265 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/bonding.rb +++ b/src/lib/y2network/wicked/connection_config_writers/bonding.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Bonding # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/bridge.rb b/src/lib/y2network/wicked/connection_config_writers/bridge.rb similarity index 94% rename from src/lib/y2network/sysconfig/connection_config_writers/bridge.rb rename to src/lib/y2network/wicked/connection_config_writers/bridge.rb index 4fae4e903..a83e68c06 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/bridge.rb +++ b/src/lib/y2network/wicked/connection_config_writers/bridge.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a # ConnectionConfig::Bridge object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb b/src/lib/y2network/wicked/connection_config_writers/ctc.rb similarity index 92% rename from src/lib/y2network/sysconfig/connection_config_writers/ctc.rb rename to src/lib/y2network/wicked/connection_config_writers/ctc.rb index 59e7b670b..754642ce3 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/ctc.rb +++ b/src/lib/y2network/wicked/connection_config_writers/ctc.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Ctc # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb b/src/lib/y2network/wicked/connection_config_writers/dummy.rb similarity index 94% rename from src/lib/y2network/sysconfig/connection_config_writers/dummy.rb rename to src/lib/y2network/wicked/connection_config_writers/dummy.rb index 980ca861d..ec396b4dc 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/dummy.rb +++ b/src/lib/y2network/wicked/connection_config_writers/dummy.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Dummy # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb b/src/lib/y2network/wicked/connection_config_writers/ethernet.rb similarity index 93% rename from src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb rename to src/lib/y2network/wicked/connection_config_writers/ethernet.rb index e1b0eadc8..b13801d62 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/ethernet.rb +++ b/src/lib/y2network/wicked/connection_config_writers/ethernet.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Ethernet # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb b/src/lib/y2network/wicked/connection_config_writers/hsi.rb similarity index 92% rename from src/lib/y2network/sysconfig/connection_config_writers/hsi.rb rename to src/lib/y2network/wicked/connection_config_writers/hsi.rb index 46eaf2033..a0a56f008 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/hsi.rb +++ b/src/lib/y2network/wicked/connection_config_writers/hsi.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a # ConnectionConfig::Hsi object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb b/src/lib/y2network/wicked/connection_config_writers/infiniband.rb similarity index 93% rename from src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb rename to src/lib/y2network/wicked/connection_config_writers/infiniband.rb index 19a80cbd5..011dc0d1a 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/infiniband.rb +++ b/src/lib/y2network/wicked/connection_config_writers/infiniband.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Infiniband # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb b/src/lib/y2network/wicked/connection_config_writers/lcs.rb similarity index 92% rename from src/lib/y2network/sysconfig/connection_config_writers/lcs.rb rename to src/lib/y2network/wicked/connection_config_writers/lcs.rb index 98325bee7..1816bec7b 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/lcs.rb +++ b/src/lib/y2network/wicked/connection_config_writers/lcs.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Lcs # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb b/src/lib/y2network/wicked/connection_config_writers/qeth.rb similarity index 92% rename from src/lib/y2network/sysconfig/connection_config_writers/qeth.rb rename to src/lib/y2network/wicked/connection_config_writers/qeth.rb index 62ca35e47..1f91ff3ff 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/qeth.rb +++ b/src/lib/y2network/wicked/connection_config_writers/qeth.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Qeth # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/tap.rb b/src/lib/y2network/wicked/connection_config_writers/tap.rb similarity index 93% rename from src/lib/y2network/sysconfig/connection_config_writers/tap.rb rename to src/lib/y2network/wicked/connection_config_writers/tap.rb index 9057c59cd..c6b148b0a 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/tap.rb +++ b/src/lib/y2network/wicked/connection_config_writers/tap.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Tap # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/tun.rb b/src/lib/y2network/wicked/connection_config_writers/tun.rb similarity index 93% rename from src/lib/y2network/sysconfig/connection_config_writers/tun.rb rename to src/lib/y2network/wicked/connection_config_writers/tun.rb index b6d82f89e..184a40831 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/tun.rb +++ b/src/lib/y2network/wicked/connection_config_writers/tun.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Tun # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/usb.rb b/src/lib/y2network/wicked/connection_config_writers/usb.rb similarity index 92% rename from src/lib/y2network/sysconfig/connection_config_writers/usb.rb rename to src/lib/y2network/wicked/connection_config_writers/usb.rb index d16f4abb2..e8ea3b067 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/usb.rb +++ b/src/lib/y2network/wicked/connection_config_writers/usb.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Usb # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb b/src/lib/y2network/wicked/connection_config_writers/vlan.rb similarity index 94% rename from src/lib/y2network/sysconfig/connection_config_writers/vlan.rb rename to src/lib/y2network/wicked/connection_config_writers/vlan.rb index 849abf869..0b3cd837c 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/vlan.rb +++ b/src/lib/y2network/wicked/connection_config_writers/vlan.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Vlan # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb b/src/lib/y2network/wicked/connection_config_writers/wireless.rb similarity index 97% rename from src/lib/y2network/sysconfig/connection_config_writers/wireless.rb rename to src/lib/y2network/wicked/connection_config_writers/wireless.rb index 447753799..a89520850 100644 --- a/src/lib/y2network/sysconfig/connection_config_writers/wireless.rb +++ b/src/lib/y2network/wicked/connection_config_writers/wireless.rb @@ -17,10 +17,10 @@ # 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" +require "y2network/wicked/connection_config_writers/base" module Y2Network - module Sysconfig + module Wicked module ConnectionConfigWriters # This class is responsible for writing the information from a ConnectionConfig::Wireless # object to the underlying system. diff --git a/src/lib/y2network/sysconfig/dns_reader.rb b/src/lib/y2network/wicked/dns_reader.rb similarity index 99% rename from src/lib/y2network/sysconfig/dns_reader.rb rename to src/lib/y2network/wicked/dns_reader.rb index 3488e691e..f6db36b7f 100644 --- a/src/lib/y2network/sysconfig/dns_reader.rb +++ b/src/lib/y2network/wicked/dns_reader.rb @@ -22,7 +22,7 @@ Yast.import "Mode" module Y2Network - module Sysconfig + module Wicked # Reads DNS configuration from sysconfig files class DNSReader include Yast::Logger diff --git a/src/lib/y2network/sysconfig/hostname_reader.rb b/src/lib/y2network/wicked/hostname_reader.rb similarity index 99% rename from src/lib/y2network/sysconfig/hostname_reader.rb rename to src/lib/y2network/wicked/hostname_reader.rb index cb8f56a80..38f54ca35 100644 --- a/src/lib/y2network/sysconfig/hostname_reader.rb +++ b/src/lib/y2network/wicked/hostname_reader.rb @@ -28,7 +28,7 @@ Yast.import "NetHwDetection" module Y2Network - module Sysconfig + module Wicked # This class is responsible for reading the hostname # # Depending on different circunstamces, the hostname can be read from different places (from a diff --git a/src/lib/y2network/sysconfig/interfaces_reader.rb b/src/lib/y2network/wicked/interfaces_reader.rb similarity index 98% rename from src/lib/y2network/sysconfig/interfaces_reader.rb rename to src/lib/y2network/wicked/interfaces_reader.rb index a479c7e1d..78b0b136c 100644 --- a/src/lib/y2network/sysconfig/interfaces_reader.rb +++ b/src/lib/y2network/wicked/interfaces_reader.rb @@ -23,18 +23,18 @@ require "y2network/virtual_interface" require "y2network/physical_interface" require "y2network/s390_group_device" -require "y2network/sysconfig/connection_config_reader" +require "y2network/wicked/connection_config_reader" require "cfa/interface_file" require "y2network/interfaces_collection" require "y2network/connection_configs_collection" require "y2network/s390_group_devices_collection" -require "y2network/sysconfig/type_detector" +require "y2network/wicked/type_detector" require "y2network/udev_rule" Yast.import "Arch" module Y2Network - module Sysconfig + module Wicked # This class reads interfaces configuration from sysconfig files # # * Physical interfaces are read from the hardware. diff --git a/src/lib/y2network/sysconfig/type_detector.rb b/src/lib/y2network/wicked/type_detector.rb similarity index 98% rename from src/lib/y2network/sysconfig/type_detector.rb rename to src/lib/y2network/wicked/type_detector.rb index ab70c6292..04a37b3c5 100644 --- a/src/lib/y2network/sysconfig/type_detector.rb +++ b/src/lib/y2network/wicked/type_detector.rb @@ -23,7 +23,7 @@ require "cfa/interface_file" module Y2Network - module Sysconfig + module Wicked # Detects type of given interface. New implementation of what was in # @see Yast::NetworkInterfaces.GetType class TypeDetector < Y2Network::TypeDetector diff --git a/src/modules/DNS.rb b/src/modules/DNS.rb index f5596cfb5..9f7dcfa55 100644 --- a/src/modules/DNS.rb +++ b/src/modules/DNS.rb @@ -29,7 +29,7 @@ # respecting DHCP. require "yast" require "shellwords" -require "y2network/sysconfig/config_writer" +require "y2network/wicked/config_writer" module Yast class DNSClass < Module diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb index 6f220ba3a..12d63a351 100644 --- a/src/modules/Lan.rb +++ b/src/modules/Lan.rb @@ -743,7 +743,7 @@ def yast_config # # It resets already read configuration. def read_config - system_config = Y2Network::Config.from(:sysconfig) + system_config = Y2Network::Config.from(:wicked) system_config.backend = NetworkService.cached_name Yast::Lan.add_config(:system, system_config) Yast::Lan.add_config(:yast, system_config.copy) @@ -756,7 +756,7 @@ def read_config # # @see Y2Network::ConfigWriter def write_config(only: nil) - target = :sysconfig if Mode.auto + target = :wicked if Mode.auto yast_config.write(original: system_config, target: target, only: only) # Force a refresh of the system_config bsc#1162987 add_config(:system, yast_config.copy) diff --git a/test/dns_test.rb b/test/dns_test.rb index bdf284bc6..a71b0cc6b 100755 --- a/test/dns_test.rb +++ b/test/dns_test.rb @@ -35,7 +35,7 @@ let(:logger) { double(info: true, debug: true) } let(:lan_config) do Y2Network::Config.new( - dns: dns_config, hostname: hostname_config, source: :sysconfig, + dns: dns_config, hostname: hostname_config, source: :wicked, connections: connections, interfaces: interfaces ) end diff --git a/test/host_test.rb b/test/host_test.rb index 082aa2029..fa5ddf1e0 100755 --- a/test/host_test.rb +++ b/test/host_test.rb @@ -26,7 +26,7 @@ require "cfa/memory_file" require "cfa/base_model" require "cfa/hosts" -require "y2network/sysconfig/type_detector" +require "y2network/wicked/type_detector" Yast.import "Host" @@ -53,7 +53,7 @@ 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) + allow(Y2Network::Wicked::TypeDetector) .to receive(:type_of) .with(/eth[0-9]/) .and_return(Y2Network::InterfaceType::ETHERNET) diff --git a/test/lan_test.rb b/test/lan_test.rb index c6fb79881..ddb936b47 100755 --- a/test/lan_test.rb +++ b/test/lan_test.rb @@ -31,7 +31,7 @@ describe "LanClass" do subject { Yast::Lan } - let(:system_config) { Y2Network::Config.new(interfaces: [], source: :sysconfig) } + let(:system_config) { Y2Network::Config.new(interfaces: [], source: :wicked) } let(:backend) { :wicked } describe "#Packages" do diff --git a/test/network_autoconfiguration_test.rb b/test/network_autoconfiguration_test.rb index b3e9b21c4..d1581c6e9 100755 --- a/test/network_autoconfiguration_test.rb +++ b/test/network_autoconfiguration_test.rb @@ -66,7 +66,7 @@ def probe_netcard_factory(num) end describe Yast::NetworkAutoconfiguration do - let(:yast_config) { Y2Network::Config.new(source: :sysconfig) } + let(:yast_config) { Y2Network::Config.new(source: :wicked) } let(:system_config) { yast_config.copy } before do diff --git a/test/network_autoyast_test.rb b/test/network_autoyast_test.rb index afeb74523..6e25f8938 100755 --- a/test/network_autoyast_test.rb +++ b/test/network_autoyast_test.rb @@ -22,7 +22,7 @@ require_relative "test_helper" require "network/network_autoyast" -require "y2network/sysconfig/config_reader" +require "y2network/wicked/config_reader" require "y2network/s390_device_activators/qeth" Yast.import "Profile" @@ -36,7 +36,7 @@ interfaces: Y2Network::InterfacesCollection.new([]), routing: Y2Network::Routing.new(tables: []), dns: Y2Network::DNS.new, - source: :sysconfig + source: :wicked ) end diff --git a/test/save_network_test.rb b/test/save_network_test.rb index bbb09b94c..2024d376a 100755 --- a/test/save_network_test.rb +++ b/test/save_network_test.rb @@ -35,9 +35,9 @@ let(:destdir) { Dir.mktmpdir } let(:destdir_sysconfig) { File.join(destdir, "etc", "sysconfig", "network") } let(:scr_root) { File.join(DATA_PATH, "instsys") } - let(:yast_config) { Y2Network::Config.new(source: :sysconfig) } + let(:yast_config) { Y2Network::Config.new(source: :wicked) } let(:system_config) do - Y2Network::Config.new(source: :sysconfig, backend: system_backend) + Y2Network::Config.new(source: :wicked, backend: system_backend) end let(:system_backend) { Y2Network::Backends::Wicked.new } let(:s390) { false } diff --git a/test/y2network/autoinst/config_reader_test.rb b/test/y2network/autoinst/config_reader_test.rb index 60dd67164..16826174c 100755 --- a/test/y2network/autoinst/config_reader_test.rb +++ b/test/y2network/autoinst/config_reader_test.rb @@ -23,7 +23,7 @@ require "y2network/config" require "y2network/autoinst_profile/networking_section" require "y2network/autoinst/config_reader" -require "y2network/sysconfig/interfaces_reader" +require "y2network/wicked/interfaces_reader" describe Y2Network::Autoinst::ConfigReader do let(:subject) { described_class.new(networking_section, system_config) } diff --git a/test/y2network/autoinst/dns_reader_test.rb b/test/y2network/autoinst/dns_reader_test.rb index 66c296eb3..b5c4fc1df 100755 --- a/test/y2network/autoinst/dns_reader_test.rb +++ b/test/y2network/autoinst/dns_reader_test.rb @@ -22,7 +22,7 @@ require_relative "../../test_helper" require "y2network/autoinst_profile/dns_section" require "y2network/autoinst/dns_reader" -require "y2network/sysconfig/hostname_reader" +require "y2network/wicked/hostname_reader" describe Y2Network::Autoinst::DNSReader do subject { described_class.new(dns_section) } @@ -40,10 +40,10 @@ "resolv_conf_policy" => "some-policy" } end - let(:hostname_reader) { instance_double(Y2Network::Sysconfig::HostnameReader) } + let(:hostname_reader) { instance_double(Y2Network::Wicked::HostnameReader) } before do - allow(Y2Network::Sysconfig::HostnameReader).to receive(:new).and_return(hostname_reader) + allow(Y2Network::Wicked::HostnameReader).to receive(:new).and_return(hostname_reader) end describe "#config" do diff --git a/test/y2network/autoinst/hostname_reader_test.rb b/test/y2network/autoinst/hostname_reader_test.rb index f756330e8..06dda310c 100755 --- a/test/y2network/autoinst/hostname_reader_test.rb +++ b/test/y2network/autoinst/hostname_reader_test.rb @@ -33,9 +33,9 @@ let(:current_dhcp_hostname) { :any } before do - allow_any_instance_of(Y2Network::Sysconfig::HostnameReader) + allow_any_instance_of(Y2Network::Wicked::HostnameReader) .to receive(:static_hostname).and_return(current_static_hostname) - allow_any_instance_of(Y2Network::Sysconfig::HostnameReader) + allow_any_instance_of(Y2Network::Wicked::HostnameReader) .to receive(:dhcp_hostname).and_return(current_dhcp_hostname) end diff --git a/test/y2network/autoinst_profile/networking_section_test.rb b/test/y2network/autoinst_profile/networking_section_test.rb index 0f341429d..81c11e694 100644 --- a/test/y2network/autoinst_profile/networking_section_test.rb +++ b/test/y2network/autoinst_profile/networking_section_test.rb @@ -29,7 +29,7 @@ routing: routing, dns: dns, hostname: hostname, - source: :sysconfig + source: :wicked ) end let(:routing) { double("Y2Network::Routing") } diff --git a/test/y2network/clients/auto_test.rb b/test/y2network/clients/auto_test.rb index 559f1b52c..c82f08b5a 100755 --- a/test/y2network/clients/auto_test.rb +++ b/test/y2network/clients/auto_test.rb @@ -152,7 +152,7 @@ end describe "#write" do - let(:system_config) { Y2Network::Config.new(source: :sysconfig) } + let(:system_config) { Y2Network::Config.new(source: :wicked) } before do allow(Yast::Lan).to receive(:Read) diff --git a/test/y2network/clients/dns_test.rb b/test/y2network/clients/dns_test.rb index bec92ecda..35aae71b1 100755 --- a/test/y2network/clients/dns_test.rb +++ b/test/y2network/clients/dns_test.rb @@ -27,7 +27,7 @@ let(:table) { Y2Network::RoutingTable.new([route]) } let(:config) do - Y2Network::Config.new(interfaces: [], dns: dns, hostname: hostname, source: :sysconfig) + Y2Network::Config.new(interfaces: [], dns: dns, hostname: hostname, source: :wicked) end let(:dns) { Y2Network::DNS.new(resolv_conf_policy: "auto") } let(:hostname) do diff --git a/test/y2network/clients/routing_test.rb b/test/y2network/clients/routing_test.rb index e314adb8b..4a0fb3d2d 100755 --- a/test/y2network/clients/routing_test.rb +++ b/test/y2network/clients/routing_test.rb @@ -34,7 +34,7 @@ end let(:table) { Y2Network::RoutingTable.new([route]) } - let(:config) { Y2Network::Config.new(interfaces: [], routing: routing, source: :sysconfig) } + let(:config) { Y2Network::Config.new(interfaces: [], routing: routing, source: :wicked) } let(:routing) { Y2Network::Routing.new(tables: [table], forward_ipv4: true, forward_ipv6: false) } before do diff --git a/test/y2network/config_reader_test.rb b/test/y2network/config_reader_test.rb index 894d09418..9527c6a2d 100644 --- a/test/y2network/config_reader_test.rb +++ b/test/y2network/config_reader_test.rb @@ -22,8 +22,8 @@ describe Y2Network::ConfigReader do describe ".for" do it "returns the reader for the given source" do - reader = Y2Network::ConfigReader.for(:sysconfig) - expect(reader).to be_a(Y2Network::Sysconfig::ConfigReader) + reader = Y2Network::ConfigReader.for(:wicked) + expect(reader).to be_a(Y2Network::Wicked::ConfigReader) end end end diff --git a/test/y2network/config_test.rb b/test/y2network/config_test.rb index 47b216fc3..ffe0aafbf 100644 --- a/test/y2network/config_test.rb +++ b/test/y2network/config_test.rb @@ -25,8 +25,8 @@ require "y2network/connection_config/bridge" require "y2network/connection_config/ethernet" require "y2network/connection_configs_collection" -require "y2network/sysconfig/config_reader" -require "y2network/sysconfig/config_writer" +require "y2network/wicked/config_reader" +require "y2network/wicked/config_writer" require "y2network/network_manager/config_writer" describe Y2Network::Config do @@ -37,7 +37,7 @@ subject(:config) do described_class.new( interfaces: interfaces, connections: connections, routing: routing, - drivers: drivers, source: :sysconfig + drivers: drivers, source: :wicked ) end @@ -65,16 +65,16 @@ describe ".from" do let(:reader) do - instance_double(Y2Network::Sysconfig::ConfigReader, config: config) + instance_double(Y2Network::Wicked::ConfigReader, config: config) end before do - allow(Y2Network::ConfigReader).to receive(:for).with(:sysconfig) + allow(Y2Network::ConfigReader).to receive(:for).with(:wicked) .and_return(reader) end it "returns the configuration from the given reader" do - expect(described_class.from(:sysconfig)).to eq(config) + expect(described_class.from(:wicked)).to eq(config) end end @@ -109,12 +109,12 @@ end describe "#write" do - let(:sysconfig_writer) { instance_double(Y2Network::Sysconfig::ConfigWriter) } + let(:wicked_writer) { instance_double(Y2Network::Wicked::ConfigWriter) } let(:nm_writer) { instance_double(Y2Network::NetworkManager::ConfigWriter) } before do - allow(Y2Network::ConfigWriter).to receive(:for).with(:sysconfig) - .and_return(sysconfig_writer) + allow(Y2Network::ConfigWriter).to receive(:for).with(:wicked) + .and_return(wicked_writer) allow(Y2Network::ConfigWriter).to receive(:for).with(:network_manager) .and_return(nm_writer) end @@ -128,14 +128,14 @@ let(:original) { instance_double(described_class) } it "passes that configuration to the writer" do - expect(sysconfig_writer).to receive(:write).with(config, original, only: nil) + expect(wicked_writer).to receive(:write).with(config, original, only: nil) config.write(original: original) end end context "when a set of sections is given" do it "applies the configuration for those sections only" do - expect(sysconfig_writer).to receive(:write).with(config, nil, only: [:dns]) + expect(wicked_writer).to receive(:write).with(config, nil, only: [:dns]) config.write(only: [:dns]) end end @@ -152,7 +152,7 @@ context "and no backend is set" do it "writes the config using the writer for the source" do - expect(sysconfig_writer).to receive(:write).with(config, nil, only: nil) + expect(wicked_writer).to receive(:write).with(config, nil, only: nil) config.write end end diff --git a/test/y2network/config_writer_test.rb b/test/y2network/config_writer_test.rb index 605833830..cde10eff5 100644 --- a/test/y2network/config_writer_test.rb +++ b/test/y2network/config_writer_test.rb @@ -22,8 +22,8 @@ describe Y2Network::ConfigWriter do describe ".for" do it "returns the writer for the given source" do - reader = Y2Network::ConfigWriter.for(:sysconfig) - expect(reader).to be_a(Y2Network::Sysconfig::ConfigWriter) + reader = Y2Network::ConfigWriter.for(:wicked) + expect(reader).to be_a(Y2Network::Wicked::ConfigWriter) end end end diff --git a/test/y2network/interface_config_builder_test.rb b/test/y2network/interface_config_builder_test.rb index 505453588..399050c0c 100755 --- a/test/y2network/interface_config_builder_test.rb +++ b/test/y2network/interface_config_builder_test.rb @@ -35,7 +35,7 @@ res end - let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :sysconfig) } + let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :wicked) } let(:interfaces) { Y2Network::InterfacesCollection.new([eth0]) } let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } diff --git a/test/y2network/interface_config_builders/infiniband_test.rb b/test/y2network/interface_config_builders/infiniband_test.rb index 254314360..51f0bac8e 100755 --- a/test/y2network/interface_config_builders/infiniband_test.rb +++ b/test/y2network/interface_config_builders/infiniband_test.rb @@ -33,7 +33,7 @@ res end - let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :sysconfig) } + let(:config) { Y2Network::Config.new(interfaces: interfaces, source: :wicked) } let(:interfaces) { Y2Network::InterfacesCollection.new([ib0]) } let(:ib0) { Y2Network::PhysicalInterface.new("ib0") } diff --git a/test/y2network/sysconfig/config_reader_test.rb b/test/y2network/wicked/config_reader_test.rb similarity index 81% rename from test/y2network/sysconfig/config_reader_test.rb rename to test/y2network/wicked/config_reader_test.rb index 1dfded015..1f0a71528 100644 --- a/test/y2network/sysconfig/config_reader_test.rb +++ b/test/y2network/wicked/config_reader_test.rb @@ -17,10 +17,10 @@ # 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/config_reader" -require "y2network/sysconfig/dns_reader" +require "y2network/wicked/config_reader" +require "y2network/wicked/dns_reader" -describe Y2Network::Sysconfig::ConfigReader do +describe Y2Network::Wicked::ConfigReader do subject(:reader) { described_class.new } let(:eth0) { Y2Network::Interface.new("eth0") } @@ -31,11 +31,11 @@ let(:s390_devices) { [] } let(:drivers) { Y2Network::Driver.new("virtio_net", "") } let(:routes_file) { instance_double(CFA::RoutesFile, load: nil, routes: []) } - let(:dns_reader) { instance_double(Y2Network::Sysconfig::DNSReader, config: dns) } - let(:hostname_reader) { instance_double(Y2Network::Sysconfig::HostnameReader, config: hostname) } + let(:dns_reader) { instance_double(Y2Network::Wicked::DNSReader, config: dns) } + let(:hostname_reader) { instance_double(Y2Network::Wicked::HostnameReader, config: hostname) } let(:interfaces_reader) do instance_double( - Y2Network::Sysconfig::InterfacesReader, + Y2Network::Wicked::InterfacesReader, interfaces: Y2Network::InterfacesCollection.new(interfaces), connections: connections, s390_devices: s390_devices, @@ -43,13 +43,13 @@ ) end - let(:dns) { double("Y2Network::Sysconfig::DNSReader") } - let(:hostname) { double("Y2Network::Sysconfig::HostnameReader") } + let(:dns) { double("Y2Network::Wicked::DNSReader") } + let(:hostname) { double("Y2Network::Wicked::HostnameReader") } before do - allow(Y2Network::Sysconfig::DNSReader).to receive(:new).and_return(dns_reader) - allow(Y2Network::Sysconfig::HostnameReader).to receive(:new).and_return(hostname_reader) - allow(Y2Network::Sysconfig::InterfacesReader).to receive(:new).and_return(interfaces_reader) + allow(Y2Network::Wicked::DNSReader).to receive(:new).and_return(dns_reader) + allow(Y2Network::Wicked::HostnameReader).to receive(:new).and_return(hostname_reader) + allow(Y2Network::Wicked::InterfacesReader).to receive(:new).and_return(interfaces_reader) end around { |e| change_scr_root(File.join(DATA_PATH, "scr_read"), &e) } @@ -82,9 +82,9 @@ expect(config.drivers).to eq(drivers) end - it "sets the config source to :sysconfig" do + it "sets the config source to :wicked" do config = reader.config - expect(config.source).to eq(:sysconfig) + expect(config.source).to eq(:wicked) end end diff --git a/test/y2network/sysconfig/config_writer_test.rb b/test/y2network/wicked/config_writer_test.rb similarity index 93% rename from test/y2network/sysconfig/config_writer_test.rb rename to test/y2network/wicked/config_writer_test.rb index 9b6be7646..fa6561e01 100644 --- a/test/y2network/sysconfig/config_writer_test.rb +++ b/test/y2network/wicked/config_writer_test.rb @@ -18,7 +18,7 @@ # find current contact information at www.suse.com. require_relative "../../test_helper" require_relative "../../support/config_writer_examples" -require "y2network/sysconfig/config_writer" +require "y2network/wicked/config_writer" require "y2network/config" require "y2network/connection_configs_collection" require "y2network/interface" @@ -29,7 +29,7 @@ require "y2network/connection_config/ethernet" require "y2network/connection_config/ip_config" -describe Y2Network::Sysconfig::ConfigWriter do +describe Y2Network::Wicked::ConfigWriter do subject(:writer) { described_class.new } include_examples "ConfigWriter" @@ -105,7 +105,7 @@ allow(CFA::RoutesFile).to receive(:new) .with(no_args) .and_return(routes_file) - allow_any_instance_of(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:write) + allow_any_instance_of(Y2Network::Wicked::ConnectionConfigWriter).to receive(:write) allow(Y2Network::ConfigWriters::InterfacesWriter).to receive(:new) .and_return(interfaces_writer) end @@ -179,17 +179,17 @@ Y2Network::Config.new( interfaces: Y2Network::InterfacesCollection.new([eth0]), connections: Y2Network::ConnectionConfigsCollection.new([eth0_conn]), - source: :sysconfig + source: :wicked ) end - let(:conn_writer) { instance_double(Y2Network::Sysconfig::ConnectionConfigWriter) } + let(:conn_writer) { instance_double(Y2Network::Wicked::ConnectionConfigWriter) } let(:ifroute_eth1) do instance_double(CFA::RoutesFile, save: nil, :routes= => nil, remove: nil) end before do - allow(Y2Network::Sysconfig::ConnectionConfigWriter).to receive(:new) + allow(Y2Network::Wicked::ConnectionConfigWriter).to receive(:new) .and_return(conn_writer) allow(CFA::RoutesFile).to receive(:new).and_return(ifroute_eth1) end @@ -201,7 +201,7 @@ end it "writes connections configurations" do - expect_any_instance_of(Y2Network::Sysconfig::ConnectionConfigWriter) + expect_any_instance_of(Y2Network::Wicked::ConnectionConfigWriter) .to receive(:write).with(eth0_conn, old_eth0_conn) writer.write(config, old_config, only: [:interfaces, :connections]) end diff --git a/test/y2network/sysconfig/connection_config_reader_test.rb b/test/y2network/wicked/connection_config_reader_test.rb similarity index 84% rename from test/y2network/sysconfig/connection_config_reader_test.rb rename to test/y2network/wicked/connection_config_reader_test.rb index 9f803400e..429346c75 100644 --- a/test/y2network/sysconfig/connection_config_reader_test.rb +++ b/test/y2network/wicked/connection_config_reader_test.rb @@ -19,11 +19,11 @@ require_relative "../../test_helper" -require "y2network/sysconfig/connection_config_reader" -require "y2network/sysconfig/connection_config_readers/wireless" +require "y2network/wicked/connection_config_reader" +require "y2network/wicked/connection_config_readers/wireless" require "y2network/physical_interface" -describe Y2Network::Sysconfig::ConnectionConfigReader do +describe Y2Network::Wicked::ConnectionConfigReader do subject(:reader) { described_class.new } describe "#read" do @@ -34,14 +34,14 @@ let(:connection_config) { double("connection_config") } let(:handler) do instance_double( - Y2Network::Sysconfig::ConnectionConfigReaders::Wireless, + Y2Network::Wicked::ConnectionConfigReaders::Wireless, connection_config: connection_config ) end before do allow(reader).to receive(:require).and_call_original - allow(Y2Network::Sysconfig::ConnectionConfigReaders::Wireless).to receive(:new) + allow(Y2Network::Wicked::ConnectionConfigReaders::Wireless).to receive(:new) .and_return(handler) allow(CFA::InterfaceFile).to receive(:new) .and_return(interface_file) @@ -49,7 +49,7 @@ it "uses the appropiate handler" do expect(reader).to receive(:require) - .with("y2network/sysconfig/connection_config_readers/wireless") + .with("y2network/wicked/connection_config_readers/wireless") conn = reader.read(interface, "wlan") expect(conn).to be(connection_config) end diff --git a/test/y2network/sysconfig/connection_config_readers/bonding_test.rb b/test/y2network/wicked/connection_config_readers/bonding_test.rb similarity index 91% rename from test/y2network/sysconfig/connection_config_readers/bonding_test.rb rename to test/y2network/wicked/connection_config_readers/bonding_test.rb index 38f938d67..bd20879d5 100644 --- a/test/y2network/sysconfig/connection_config_readers/bonding_test.rb +++ b/test/y2network/wicked/connection_config_readers/bonding_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/bonding" +require "y2network/wicked/connection_config_readers/bonding" require "cfa/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Bonding do +describe Y2Network::Wicked::ConnectionConfigReaders::Bonding do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/bridge_test.rb b/test/y2network/wicked/connection_config_readers/bridge_test.rb similarity index 91% rename from test/y2network/sysconfig/connection_config_readers/bridge_test.rb rename to test/y2network/wicked/connection_config_readers/bridge_test.rb index 5f39f3a23..11a0a87e3 100644 --- a/test/y2network/sysconfig/connection_config_readers/bridge_test.rb +++ b/test/y2network/wicked/connection_config_readers/bridge_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/bridge" +require "y2network/wicked/connection_config_readers/bridge" require "cfa/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Bridge do +describe Y2Network::Wicked::ConnectionConfigReaders::Bridge do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/ctc_test.rb b/test/y2network/wicked/connection_config_readers/ctc_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/ctc_test.rb rename to test/y2network/wicked/connection_config_readers/ctc_test.rb index 239a41a36..d16e3f81f 100644 --- a/test/y2network/sysconfig/connection_config_readers/ctc_test.rb +++ b/test/y2network/wicked/connection_config_readers/ctc_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/ctc" +require "y2network/wicked/connection_config_readers/ctc" require "cfa/interface_file" require "y2network/boot_protocol" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Ctc do +describe Y2Network::Wicked::ConnectionConfigReaders::Ctc do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/dummy_test.rb b/test/y2network/wicked/connection_config_readers/dummy_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/dummy_test.rb rename to test/y2network/wicked/connection_config_readers/dummy_test.rb index 7edcd7710..1d852259b 100644 --- a/test/y2network/sysconfig/connection_config_readers/dummy_test.rb +++ b/test/y2network/wicked/connection_config_readers/dummy_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/dummy" +require "y2network/wicked/connection_config_readers/dummy" require "cfa/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Dummy do +describe Y2Network::Wicked::ConnectionConfigReaders::Dummy do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb b/test/y2network/wicked/connection_config_readers/ethernet_test.rb similarity index 95% rename from test/y2network/sysconfig/connection_config_readers/ethernet_test.rb rename to test/y2network/wicked/connection_config_readers/ethernet_test.rb index ebad5c053..14754aa30 100644 --- a/test/y2network/sysconfig/connection_config_readers/ethernet_test.rb +++ b/test/y2network/wicked/connection_config_readers/ethernet_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/ethernet" +require "y2network/wicked/connection_config_readers/ethernet" require "cfa/interface_file" require "y2network/boot_protocol" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Ethernet do +describe Y2Network::Wicked::ConnectionConfigReaders::Ethernet do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/hsi_test.rb b/test/y2network/wicked/connection_config_readers/hsi_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/hsi_test.rb rename to test/y2network/wicked/connection_config_readers/hsi_test.rb index c0cf6c779..fbb1fb4aa 100644 --- a/test/y2network/sysconfig/connection_config_readers/hsi_test.rb +++ b/test/y2network/wicked/connection_config_readers/hsi_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/hsi" +require "y2network/wicked/connection_config_readers/hsi" require "cfa/interface_file" require "y2network/boot_protocol" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Hsi do +describe Y2Network::Wicked::ConnectionConfigReaders::Hsi do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb b/test/y2network/wicked/connection_config_readers/infiniband_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/infiniband_test.rb rename to test/y2network/wicked/connection_config_readers/infiniband_test.rb index 55026837f..b82082f8b 100644 --- a/test/y2network/sysconfig/connection_config_readers/infiniband_test.rb +++ b/test/y2network/wicked/connection_config_readers/infiniband_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/infiniband" +require "y2network/wicked/connection_config_readers/infiniband" require "cfa/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Infiniband do +describe Y2Network::Wicked::ConnectionConfigReaders::Infiniband do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/lcs_test.rb b/test/y2network/wicked/connection_config_readers/lcs_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/lcs_test.rb rename to test/y2network/wicked/connection_config_readers/lcs_test.rb index b9bac2244..b6bca1daf 100644 --- a/test/y2network/sysconfig/connection_config_readers/lcs_test.rb +++ b/test/y2network/wicked/connection_config_readers/lcs_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/lcs" +require "y2network/wicked/connection_config_readers/lcs" require "cfa/interface_file" require "y2network/boot_protocol" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Lcs do +describe Y2Network::Wicked::ConnectionConfigReaders::Lcs do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/qeth_test.rb b/test/y2network/wicked/connection_config_readers/qeth_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/qeth_test.rb rename to test/y2network/wicked/connection_config_readers/qeth_test.rb index a6df7d531..a07ca5ea9 100644 --- a/test/y2network/sysconfig/connection_config_readers/qeth_test.rb +++ b/test/y2network/wicked/connection_config_readers/qeth_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/qeth" +require "y2network/wicked/connection_config_readers/qeth" require "cfa/interface_file" require "y2network/boot_protocol" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Qeth do +describe Y2Network::Wicked::ConnectionConfigReaders::Qeth do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/tap_test.rb b/test/y2network/wicked/connection_config_readers/tap_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/tap_test.rb rename to test/y2network/wicked/connection_config_readers/tap_test.rb index 4699b9a5b..8abd7f33f 100644 --- a/test/y2network/sysconfig/connection_config_readers/tap_test.rb +++ b/test/y2network/wicked/connection_config_readers/tap_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/tap" +require "y2network/wicked/connection_config_readers/tap" require "cfa/interface_file" require "y2network/interface_type" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Tap do +describe Y2Network::Wicked::ConnectionConfigReaders::Tap do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/tun_test.rb b/test/y2network/wicked/connection_config_readers/tun_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/tun_test.rb rename to test/y2network/wicked/connection_config_readers/tun_test.rb index 5a0bc1f98..5b241d703 100644 --- a/test/y2network/sysconfig/connection_config_readers/tun_test.rb +++ b/test/y2network/wicked/connection_config_readers/tun_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/tun" +require "y2network/wicked/connection_config_readers/tun" require "cfa/interface_file" require "y2network/interface_type" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Tun do +describe Y2Network::Wicked::ConnectionConfigReaders::Tun do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/usb_test.rb b/test/y2network/wicked/connection_config_readers/usb_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_readers/usb_test.rb rename to test/y2network/wicked/connection_config_readers/usb_test.rb index 919092e56..e85488dd4 100644 --- a/test/y2network/sysconfig/connection_config_readers/usb_test.rb +++ b/test/y2network/wicked/connection_config_readers/usb_test.rb @@ -18,11 +18,11 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/usb" +require "y2network/wicked/connection_config_readers/usb" require "cfa/interface_file" require "y2network/boot_protocol" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Usb do +describe Y2Network::Wicked::ConnectionConfigReaders::Usb do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/vlan_test.rb b/test/y2network/wicked/connection_config_readers/vlan_test.rb similarity index 94% rename from test/y2network/sysconfig/connection_config_readers/vlan_test.rb rename to test/y2network/wicked/connection_config_readers/vlan_test.rb index e5e3caf52..5f5f240ba 100644 --- a/test/y2network/sysconfig/connection_config_readers/vlan_test.rb +++ b/test/y2network/wicked/connection_config_readers/vlan_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_readers/vlan" +require "y2network/wicked/connection_config_readers/vlan" require "cfa/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Vlan do +describe Y2Network::Wicked::ConnectionConfigReaders::Vlan do subject(:handler) { described_class.new(file) } let(:scr_root) { File.join(DATA_PATH, "scr_read") } diff --git a/test/y2network/sysconfig/connection_config_readers/wireless_test.rb b/test/y2network/wicked/connection_config_readers/wireless_test.rb similarity index 96% rename from test/y2network/sysconfig/connection_config_readers/wireless_test.rb rename to test/y2network/wicked/connection_config_readers/wireless_test.rb index 405dbffa7..ed6c328f0 100644 --- a/test/y2network/sysconfig/connection_config_readers/wireless_test.rb +++ b/test/y2network/wicked/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/wireless" +require "y2network/wicked/connection_config_readers/wireless" require "cfa/interface_file" -describe Y2Network::Sysconfig::ConnectionConfigReaders::Wireless do +describe Y2Network::Wicked::ConnectionConfigReaders::Wireless do subject(:handler) { described_class.new(file) } let(:interface_name) { "wlan0" } diff --git a/test/y2network/sysconfig/connection_config_writer_test.rb b/test/y2network/wicked/connection_config_writer_test.rb similarity index 91% rename from test/y2network/sysconfig/connection_config_writer_test.rb rename to test/y2network/wicked/connection_config_writer_test.rb index 9c3e614d1..a1f98f3b8 100644 --- a/test/y2network/sysconfig/connection_config_writer_test.rb +++ b/test/y2network/wicked/connection_config_writer_test.rb @@ -19,12 +19,12 @@ require_relative "../../test_helper" -require "y2network/sysconfig/connection_config_writer" -require "y2network/sysconfig/connection_config_writers/ethernet" +require "y2network/wicked/connection_config_writer" +require "y2network/wicked/connection_config_writers/ethernet" require "y2network/connection_config/ethernet" require "y2network/interface_type" -describe Y2Network::Sysconfig::ConnectionConfigWriter do +describe Y2Network::Wicked::ConnectionConfigWriter do subject(:writer) { described_class.new } let(:conn) do @@ -57,14 +57,14 @@ describe "#write" do let(:handler) do instance_double( - Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet, + Y2Network::Wicked::ConnectionConfigWriters::Ethernet, write: nil ) end before do allow(writer).to receive(:require).and_call_original - allow(Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet).to receive(:new) + allow(Y2Network::Wicked::ConnectionConfigWriters::Ethernet).to receive(:new) .and_return(handler) allow(CFA::InterfaceFile).to receive(:new).and_return(file) end diff --git a/test/y2network/sysconfig/connection_config_writers/bonding_test.rb b/test/y2network/wicked/connection_config_writers/bonding_test.rb similarity index 93% rename from test/y2network/sysconfig/connection_config_writers/bonding_test.rb rename to test/y2network/wicked/connection_config_writers/bonding_test.rb index 1cdb5a093..f8bbe68a9 100644 --- a/test/y2network/sysconfig/connection_config_writers/bonding_test.rb +++ b/test/y2network/wicked/connection_config_writers/bonding_test.rb @@ -19,12 +19,12 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/bonding" +require "y2network/wicked/connection_config_writers/bonding" require "cfa/interface_file" require "y2network/startmode" require "y2network/connection_config/bonding" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Bonding do +describe Y2Network::Wicked::ConnectionConfigWriters::Bonding do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/bridge_test.rb b/test/y2network/wicked/connection_config_writers/bridge_test.rb similarity index 93% rename from test/y2network/sysconfig/connection_config_writers/bridge_test.rb rename to test/y2network/wicked/connection_config_writers/bridge_test.rb index 9e9aaad28..dc85cd4bb 100644 --- a/test/y2network/sysconfig/connection_config_writers/bridge_test.rb +++ b/test/y2network/wicked/connection_config_writers/bridge_test.rb @@ -19,13 +19,13 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/bridge" +require "y2network/wicked/connection_config_writers/bridge" require "cfa/interface_file" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/bridge" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Bridge do +describe Y2Network::Wicked::ConnectionConfigWriters::Bridge do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/ctc_test.rb b/test/y2network/wicked/connection_config_writers/ctc_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_writers/ctc_test.rb rename to test/y2network/wicked/connection_config_writers/ctc_test.rb index c511e9a5f..174788b6a 100644 --- a/test/y2network/sysconfig/connection_config_writers/ctc_test.rb +++ b/test/y2network/wicked/connection_config_writers/ctc_test.rb @@ -19,12 +19,12 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/ctc" +require "y2network/wicked/connection_config_writers/ctc" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/ctc" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Ctc do +describe Y2Network::Wicked::ConnectionConfigWriters::Ctc do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb b/test/y2network/wicked/connection_config_writers/dummy_test.rb similarity index 94% rename from test/y2network/sysconfig/connection_config_writers/dummy_test.rb rename to test/y2network/wicked/connection_config_writers/dummy_test.rb index c41a907d9..a286aa9b8 100644 --- a/test/y2network/sysconfig/connection_config_writers/dummy_test.rb +++ b/test/y2network/wicked/connection_config_writers/dummy_test.rb @@ -19,13 +19,13 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/dummy" +require "y2network/wicked/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 +describe Y2Network::Wicked::ConnectionConfigWriters::Dummy do subject(:handler) { described_class.new(file) } let(:scr_root) { Dir.mktmpdir } diff --git a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb b/test/y2network/wicked/connection_config_writers/ethernet_test.rb similarity index 96% rename from test/y2network/sysconfig/connection_config_writers/ethernet_test.rb rename to test/y2network/wicked/connection_config_writers/ethernet_test.rb index 7bd28ac6f..a1eaecaac 100644 --- a/test/y2network/sysconfig/connection_config_writers/ethernet_test.rb +++ b/test/y2network/wicked/connection_config_writers/ethernet_test.rb @@ -19,14 +19,14 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/ethernet" +require "y2network/wicked/connection_config_writers/ethernet" require "y2network/boot_protocol" require "y2network/startmode" require "cfa/interface_file" require "y2network/connection_config/ethernet" require "y2network/connection_config/ip_config" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Ethernet do +describe Y2Network::Wicked::ConnectionConfigWriters::Ethernet do subject(:handler) { described_class.new(file) } let(:scr_root) { Dir.mktmpdir } diff --git a/test/y2network/sysconfig/connection_config_writers/hsi_test.rb b/test/y2network/wicked/connection_config_writers/hsi_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_writers/hsi_test.rb rename to test/y2network/wicked/connection_config_writers/hsi_test.rb index 39af6e8b1..c70766c45 100644 --- a/test/y2network/sysconfig/connection_config_writers/hsi_test.rb +++ b/test/y2network/wicked/connection_config_writers/hsi_test.rb @@ -19,12 +19,12 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/hsi" +require "y2network/wicked/connection_config_writers/hsi" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/hsi" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Hsi do +describe Y2Network::Wicked::ConnectionConfigWriters::Hsi do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb b/test/y2network/wicked/connection_config_writers/infiniband_test.rb similarity index 93% rename from test/y2network/sysconfig/connection_config_writers/infiniband_test.rb rename to test/y2network/wicked/connection_config_writers/infiniband_test.rb index 79f49ddcd..885988f3c 100644 --- a/test/y2network/sysconfig/connection_config_writers/infiniband_test.rb +++ b/test/y2network/wicked/connection_config_writers/infiniband_test.rb @@ -19,14 +19,14 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/infiniband" +require "y2network/wicked/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" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Infiniband do +describe Y2Network::Wicked::ConnectionConfigWriters::Infiniband do subject(:handler) { described_class.new(file) } let(:scr_root) { Dir.mktmpdir } diff --git a/test/y2network/sysconfig/connection_config_writers/lcs_test.rb b/test/y2network/wicked/connection_config_writers/lcs_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_writers/lcs_test.rb rename to test/y2network/wicked/connection_config_writers/lcs_test.rb index bc20b722e..0441b1fcf 100644 --- a/test/y2network/sysconfig/connection_config_writers/lcs_test.rb +++ b/test/y2network/wicked/connection_config_writers/lcs_test.rb @@ -19,12 +19,12 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/lcs" +require "y2network/wicked/connection_config_writers/lcs" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/lcs" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Lcs do +describe Y2Network::Wicked::ConnectionConfigWriters::Lcs do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/qeth_test.rb b/test/y2network/wicked/connection_config_writers/qeth_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_writers/qeth_test.rb rename to test/y2network/wicked/connection_config_writers/qeth_test.rb index 80ee108a7..0aa23d413 100644 --- a/test/y2network/sysconfig/connection_config_writers/qeth_test.rb +++ b/test/y2network/wicked/connection_config_writers/qeth_test.rb @@ -19,12 +19,12 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/qeth" +require "y2network/wicked/connection_config_writers/qeth" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/qeth" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Qeth do +describe Y2Network::Wicked::ConnectionConfigWriters::Qeth do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/tap_test.rb b/test/y2network/wicked/connection_config_writers/tap_test.rb similarity index 94% rename from test/y2network/sysconfig/connection_config_writers/tap_test.rb rename to test/y2network/wicked/connection_config_writers/tap_test.rb index b77ef66d2..e14c137e3 100644 --- a/test/y2network/sysconfig/connection_config_writers/tap_test.rb +++ b/test/y2network/wicked/connection_config_writers/tap_test.rb @@ -19,13 +19,13 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/tap" +require "y2network/wicked/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 +describe Y2Network::Wicked::ConnectionConfigWriters::Tap do subject(:handler) { described_class.new(file) } def file_content(scr_root, file) diff --git a/test/y2network/sysconfig/connection_config_writers/tun_test.rb b/test/y2network/wicked/connection_config_writers/tun_test.rb similarity index 94% rename from test/y2network/sysconfig/connection_config_writers/tun_test.rb rename to test/y2network/wicked/connection_config_writers/tun_test.rb index 5da890a3d..e6c86986d 100644 --- a/test/y2network/sysconfig/connection_config_writers/tun_test.rb +++ b/test/y2network/wicked/connection_config_writers/tun_test.rb @@ -19,13 +19,13 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/tun" +require "y2network/wicked/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 +describe Y2Network::Wicked::ConnectionConfigWriters::Tun do subject(:handler) { described_class.new(file) } def file_content(scr_root, file) diff --git a/test/y2network/sysconfig/connection_config_writers/usb_test.rb b/test/y2network/wicked/connection_config_writers/usb_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_writers/usb_test.rb rename to test/y2network/wicked/connection_config_writers/usb_test.rb index 34caec2c1..c5221ddc8 100644 --- a/test/y2network/sysconfig/connection_config_writers/usb_test.rb +++ b/test/y2network/wicked/connection_config_writers/usb_test.rb @@ -19,12 +19,12 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/usb" +require "y2network/wicked/connection_config_writers/usb" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/usb" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Usb do +describe Y2Network::Wicked::ConnectionConfigWriters::Usb do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb b/test/y2network/wicked/connection_config_writers/vlan_test.rb similarity index 92% rename from test/y2network/sysconfig/connection_config_writers/vlan_test.rb rename to test/y2network/wicked/connection_config_writers/vlan_test.rb index 113fd00f9..6dcd62236 100644 --- a/test/y2network/sysconfig/connection_config_writers/vlan_test.rb +++ b/test/y2network/wicked/connection_config_writers/vlan_test.rb @@ -19,13 +19,13 @@ require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/vlan" +require "y2network/wicked/connection_config_writers/vlan" require "y2network/startmode" require "y2network/boot_protocol" require "y2network/connection_config/vlan" require "y2network/connection_config/ip_config" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Vlan do +describe Y2Network::Wicked::ConnectionConfigWriters::Vlan do subject(:handler) { described_class.new(file) } let(:conn) do diff --git a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb b/test/y2network/wicked/connection_config_writers/wireless_test.rb similarity index 97% rename from test/y2network/sysconfig/connection_config_writers/wireless_test.rb rename to test/y2network/wicked/connection_config_writers/wireless_test.rb index ad6e8e8d7..00be7b531 100644 --- a/test/y2network/sysconfig/connection_config_writers/wireless_test.rb +++ b/test/y2network/wicked/connection_config_writers/wireless_test.rb @@ -18,13 +18,13 @@ # find current contact information at www.suse.com. require_relative "../../../test_helper" -require "y2network/sysconfig/connection_config_writers/wireless" +require "y2network/wicked/connection_config_writers/wireless" require "cfa/interface_file" require "y2network/boot_protocol" require "y2network/startmode" require "y2network/connection_config/wireless" -describe Y2Network::Sysconfig::ConnectionConfigWriters::Wireless do +describe Y2Network::Wicked::ConnectionConfigWriters::Wireless do subject(:handler) { described_class.new(file) } let(:file) { CFA::InterfaceFile.new("wlan0") } diff --git a/test/y2network/sysconfig/dns_reader_test.rb b/test/y2network/wicked/dns_reader_test.rb similarity index 90% rename from test/y2network/sysconfig/dns_reader_test.rb rename to test/y2network/wicked/dns_reader_test.rb index 0df95b918..b8db94233 100644 --- a/test/y2network/sysconfig/dns_reader_test.rb +++ b/test/y2network/wicked/dns_reader_test.rb @@ -17,10 +17,10 @@ # 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/dns_reader" -require "y2network/sysconfig/hostname_reader" +require "y2network/wicked/dns_reader" +require "y2network/wicked/hostname_reader" -describe Y2Network::Sysconfig::DNSReader do +describe Y2Network::Wicked::DNSReader do subject(:reader) { described_class.new } describe "#config" do @@ -40,7 +40,7 @@ { "config" => netconfig_dns, "dhcp" => netconfig_dhcp } end - let(:hostname_reader) { instance_double(Y2Network::Sysconfig::HostnameReader) } + let(:hostname_reader) { instance_double(Y2Network::Wicked::HostnameReader) } let(:ifcfg_eth0) do instance_double( @@ -54,7 +54,7 @@ key_parts = arg.to_s.split(".") netconfig.dig(*key_parts[3..-1]) end - allow(Y2Network::Sysconfig::HostnameReader).to receive(:new).and_return(hostname_reader) + allow(Y2Network::Wicked::HostnameReader).to receive(:new).and_return(hostname_reader) allow(CFA::InterfaceFile).to receive(:all).and_return([ifcfg_eth0]) end diff --git a/test/y2network/sysconfig/hostname_reader_test.rb b/test/y2network/wicked/hostname_reader_test.rb similarity index 98% rename from test/y2network/sysconfig/hostname_reader_test.rb rename to test/y2network/wicked/hostname_reader_test.rb index 83b16280f..155e92057 100644 --- a/test/y2network/sysconfig/hostname_reader_test.rb +++ b/test/y2network/wicked/hostname_reader_test.rb @@ -18,9 +18,9 @@ # find current contact information at www.suse.com. require_relative "../../test_helper" -require "y2network/sysconfig/hostname_reader" +require "y2network/wicked/hostname_reader" -describe Y2Network::Sysconfig::HostnameReader do +describe Y2Network::Wicked::HostnameReader do subject(:reader) { described_class.new } around { |e| change_scr_root(File.join(DATA_PATH, "scr_read"), &e) } diff --git a/test/y2network/sysconfig/interfaces_reader_test.rb b/test/y2network/wicked/interfaces_reader_test.rb similarity index 98% rename from test/y2network/sysconfig/interfaces_reader_test.rb rename to test/y2network/wicked/interfaces_reader_test.rb index 8df11e94d..b136fca07 100644 --- a/test/y2network/sysconfig/interfaces_reader_test.rb +++ b/test/y2network/wicked/interfaces_reader_test.rb @@ -18,10 +18,10 @@ # find current contact information at www.suse.com. require_relative "../../test_helper" -require "y2network/sysconfig/interfaces_reader" +require "y2network/wicked/interfaces_reader" require "y2network/udev_rule_part" -describe Y2Network::Sysconfig::InterfacesReader do +describe Y2Network::Wicked::InterfacesReader do subject(:reader) { described_class.new } let(:netcards) { [eth0, iucv] } diff --git a/test/y2network/widgets/edit_interface_test.rb b/test/y2network/widgets/edit_interface_test.rb index 2921b5cc8..c9f04d97b 100644 --- a/test/y2network/widgets/edit_interface_test.rb +++ b/test/y2network/widgets/edit_interface_test.rb @@ -29,7 +29,7 @@ let(:selected) { "eth0" } let(:table) { double("table", value: selected) } let(:config) do - Y2Network::Config.new(interfaces: interfaces, connections: connections, source: :sysconfig) + Y2Network::Config.new(interfaces: interfaces, connections: connections, source: :wicked) end let(:eth0) { Y2Network::PhysicalInterface.new("eth0") } let(:eth1) { Y2Network::PhysicalInterface.new("eth1") } diff --git a/test/y2network/widgets/ip4_forwarding_test.rb b/test/y2network/widgets/ip4_forwarding_test.rb index 6aba2629c..7d5b71b64 100644 --- a/test/y2network/widgets/ip4_forwarding_test.rb +++ b/test/y2network/widgets/ip4_forwarding_test.rb @@ -29,7 +29,7 @@ subject { described_class.new(config) } let(:config) do Y2Network::Config.new( - source: :sysconfig, + source: :wicked, interfaces: [Y2Network::Interface.new("eth0")], routing: Y2Network::Routing.new(tables: []) ) diff --git a/test/y2network/widgets/ip6_forwarding_test.rb b/test/y2network/widgets/ip6_forwarding_test.rb index f7d36c863..8d4e78d8a 100644 --- a/test/y2network/widgets/ip6_forwarding_test.rb +++ b/test/y2network/widgets/ip6_forwarding_test.rb @@ -29,7 +29,7 @@ subject { described_class.new(config) } let(:config) do Y2Network::Config.new( - source: :sysconfig, + source: :wicked, interfaces: [Y2Network::Interface.new("eth0")], routing: Y2Network::Routing.new(tables: []) )