Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1059 from yast/autoyast_poc
AutoYaST: Support to configure the network during the first stage by default
- Loading branch information
Showing
18 changed files
with
624 additions
and
391 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,5 +32,4 @@ testsuite/run/ | |
| .yardoc | ||
| /coverage | ||
| *.pot | ||
| config.* | ||
| /test/data/scr_read/var/log | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,205 +1,3 @@ | ||
| # *************************************************************************** | ||
| # | ||
| # Copyright (c) 2012 Novell, Inc. | ||
| # All Rights Reserved. | ||
| # | ||
| # This program is free software; you can redistribute it and/or | ||
| # modify it under the terms of version 2 of the GNU General Public License as | ||
| # published by the Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program; if not, contact Novell, Inc. | ||
| # | ||
| # To contact Novell about this file by physical or electronic mail, | ||
| # you may find current contact information at www.novell.com | ||
| # | ||
| # ************************************************************************** | ||
| require "y2network/clients/auto" | ||
|
|
||
| require "network/network_autoyast" | ||
|
|
||
| module Yast | ||
| # Client providing autoyast functionality | ||
| class LanAutoClient < Client | ||
| def main | ||
| Yast.import "UI" | ||
|
|
||
| textdomain "network" | ||
|
|
||
| Builtins.y2milestone("----------------------------------------") | ||
| Builtins.y2milestone("Lan autoinst client started") | ||
|
|
||
| Yast.import "Lan" | ||
| Yast.import "Progress" | ||
| Yast.import "Map" | ||
| Yast.import "NetworkInterfaces" | ||
| Yast.import "LanItems" | ||
| Yast.include self, "network/lan/wizards.rb" | ||
| Yast.include self, "network/routines.rb" | ||
|
|
||
| @func = "" | ||
| @param = {} | ||
|
|
||
| # Check arguments | ||
| if Ops.greater_than(Builtins.size(WFM.Args), 0) && | ||
| Ops.is_string?(WFM.Args(0)) | ||
| @func = Convert.to_string(WFM.Args(0)) | ||
| if Ops.greater_than(Builtins.size(WFM.Args), 1) && | ||
| Ops.is_map?(WFM.Args(1)) | ||
| @param = Convert.to_map(WFM.Args(1)) | ||
| end | ||
| end | ||
|
|
||
| Builtins.y2milestone("Lan autoinst callback: #{@func}") | ||
|
|
||
| if @func == "Summary" | ||
| @ret = Lan.Summary("summary") | ||
| elsif @func == "Reset" | ||
| Lan.Import({}) | ||
| Yast::Lan.clear_configs | ||
| @ret = {} | ||
| elsif @func == "Change" | ||
| Yast::Lan.add_config(:yast, Y2Network::Config.from(:defaults)) unless Yast::Lan.yast_config | ||
| @ret = LanAutoSequence("") | ||
| elsif @func == "Import" | ||
| @new = Lan.FromAY(@param) | ||
| # see bnc#498993 | ||
| # in case keep_install_network is set to true (in AY) | ||
| # we'll keep values from installation | ||
| # and merge with XML data (bnc#712864) | ||
| @new = NetworkAutoYast.instance.merge_configs(@new) if @new["keep_install_network"] | ||
|
|
||
| Lan.Import(@new) | ||
| @ret = true | ||
| elsif @func == "Read" | ||
| @progress_orig = Progress.set(false) | ||
| @ret = Lan.Read(:nocache) | ||
| Progress.set(@progress_orig) | ||
| elsif @func == "Packages" | ||
| @ret = Lan.AutoPackages | ||
| elsif @func == "SetModified" | ||
| @ret = Lan.SetModified | ||
| elsif @func == "GetModified" | ||
| @ret = Lan.Modified | ||
| elsif @func == "Export" | ||
| @settings2 = Lan.Export | ||
| Builtins.y2debug("settings: %1", @settings2) | ||
| @autoyast = ToAY(@settings2) | ||
| @ret = deep_copy(@autoyast) | ||
| elsif @func == "Write" | ||
| @progress_orig = Progress.set(false) | ||
|
|
||
| result = Lan.WriteOnly | ||
| Builtins.y2error("Writing lan config failed") if !result | ||
| @ret &&= result | ||
|
|
||
| if Ops.get(LanItems.autoinstall_settings, "strict_IP_check_timeout") | ||
| if Lan.isAnyInterfaceDown | ||
| @timeout = Ops.get_integer( | ||
| LanItems.autoinstall_settings, | ||
| "strict_IP_check_timeout", | ||
| 0 | ||
| ) | ||
| Builtins.y2debug("timeout %1", @timeout) | ||
| @error_text = _("Configuration Error: uninitialized interface.") | ||
| if @timeout == 0 | ||
| Popup.Error(@error_text) | ||
| else | ||
| Popup.TimedError(@error_text, @timeout) | ||
| end | ||
| end | ||
| end | ||
| Progress.set(@progress_orig) | ||
| else | ||
| Builtins.y2error("unknown function: %1", @func) | ||
| @ret = false | ||
| end | ||
|
|
||
| Builtins.y2milestone("Lan auto finished (#{@ret})") | ||
| Builtins.y2milestone("----------------------------------------") | ||
| @ret | ||
| end | ||
|
|
||
| # Convert data from native network to autoyast for XML | ||
| # @param [Hash] settings native network settings | ||
| # @return [Hash] autoyast network settings | ||
| def ToAY(settings) | ||
| settings = deep_copy(settings) | ||
| interfaces = settings["interfaces"] || [] | ||
| Builtins.y2milestone("interfaces: #{interfaces.inspect})") | ||
| net_udev = settings["net-udev"] || [] | ||
| Builtins.y2milestone("net-udev: #{net_udev.inspect})") | ||
|
|
||
| # Modules | ||
| s390_devices = settings["s390-devices"] || [] | ||
| Builtins.y2milestone("s390-devices: #{s390_devices.inspect})") | ||
|
|
||
| modules = [] | ||
| Builtins.foreach(Ops.get_map(settings, "hwcfg", {})) do |device, mod| | ||
| newmap = {} | ||
| Ops.set(newmap, "device", device) | ||
| Ops.set(newmap, "module", Ops.get_string(mod, "MODULE", "")) | ||
| Ops.set(newmap, "options", Ops.get_string(mod, "MODULE_OPTIONS", "")) | ||
| modules = Builtins.add(modules, newmap) | ||
| end | ||
|
|
||
| config = Ops.get_map(settings, "config", {}) | ||
| dhcp = Ops.get_map(config, "dhcp", {}) | ||
| dhcp_hostname = Ops.get_boolean(dhcp, "DHCLIENT_SET_HOSTNAME", false) | ||
| dns = Ops.get_map(settings, "dns", {}) | ||
| Ops.set(dns, "dhcp_hostname", dhcp_hostname) | ||
| dhcpopts = {} | ||
| if Builtins.haskey(dhcp, "DHCLIENT_HOSTNAME_OPTION") | ||
| Ops.set( | ||
| dhcpopts, | ||
| "dhclient_hostname_option", | ||
| Ops.get_string(dhcp, "DHCLIENT_HOSTNAME_OPTION", "AUTO") | ||
| ) | ||
| end | ||
| if Builtins.haskey(dhcp, "DHCLIENT_ADDITIONAL_OPTIONS") | ||
| Ops.set( | ||
| dhcpopts, | ||
| "dhclient_additional_options", | ||
| Ops.get_string(dhcp, "DHCLIENT_ADDITIONAL_OPTIONS", "") | ||
| ) | ||
| end | ||
| if Builtins.haskey(dhcp, "DHCLIENT_CLIENT_ID") | ||
| Ops.set( | ||
| dhcpopts, | ||
| "dhclient_client_id", | ||
| Ops.get_string(dhcp, "DHCLIENT_CLIENT_ID", "") | ||
| ) | ||
| end | ||
|
|
||
| ret = {} | ||
| Ops.set(ret, "managed", Ops.get_boolean(settings, "managed", false)) | ||
| if Builtins.haskey(settings, "ipv6") | ||
| Ops.set(ret, "ipv6", Ops.get_boolean(settings, "ipv6", true)) | ||
| end | ||
| Ops.set( | ||
| ret, | ||
| "keep_install_network", | ||
| Ops.get_boolean(settings, "keep_install_network", true) | ||
| ) | ||
| Ops.set(ret, "modules", modules) if Ops.greater_than(Builtins.size(modules), 0) | ||
| Ops.set(ret, "dns", dns) if Ops.greater_than(Builtins.size(dns), 0) | ||
| Ops.set(ret, "dhcp_options", dhcpopts) if Ops.greater_than(Builtins.size(dhcpopts), 0) | ||
| if Ops.greater_than( | ||
| Builtins.size(Ops.get_map(settings, "routing", {})), | ||
| 0 | ||
| ) | ||
| Ops.set(ret, "routing", Ops.get_map(settings, "routing", {})) | ||
| end | ||
| Ops.set(ret, "interfaces", interfaces) if Ops.greater_than(Builtins.size(interfaces), 0) | ||
| Ops.set(ret, "s390-devices", s390_devices) if Ops.greater_than(Builtins.size(s390_devices), 0) | ||
| Ops.set(ret, "net-udev", net_udev) if Ops.greater_than(Builtins.size(net_udev), 0) | ||
| deep_copy(ret) | ||
| end | ||
| end | ||
| end | ||
|
|
||
| Yast::LanAutoClient.new.main | ||
| Y2Network::Clients::Auto.new.run |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.