Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2014-03-11 09:24:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2014-03-05 15:36:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2014-03-11 09:24:16.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 7 17:01:44 MST 2014 - [email protected] + +- The xend portion of the relocation server code is not applicable + to the libxl toolstack. Rework for libxl compatibility. +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-vm-3.1.3.tar.bz2 New: ---- yast2-vm-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.3ede16/_old 2014-03-11 09:24:16.000000000 +0100 +++ /var/tmp/diff_new_pack.3ede16/_new 2014-03-11 09:24:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-vm-3.1.3.tar.bz2 -> yast2-vm-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/package/yast2-vm.changes new/yast2-vm-3.1.4/package/yast2-vm.changes --- old/yast2-vm-3.1.3/package/yast2-vm.changes 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/package/yast2-vm.changes 2014-03-09 04:07:55.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 7 17:01:44 MST 2014 - [email protected] + +- The xend portion of the relocation server code is not applicable + to the libxl toolstack. Rework for libxl compatibility. +- 3.1.4 + +------------------------------------------------------------------- Tue Mar 4 11:44:24 MST 2014 - [email protected] - Enable and start libvirtd. This is required for both KVM and Xen. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/package/yast2-vm.spec new/yast2-vm-3.1.4/package/yast2-vm.spec --- old/yast2-vm-3.1.3/package/yast2-vm.spec 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/package/yast2-vm.spec 2014-03-09 04:07:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.3 +Version: 3.1.4 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/src/clients/relocation-server.rb new/yast2-vm-3.1.4/src/clients/relocation-server.rb --- old/yast2-vm-3.1.3/src/clients/relocation-server.rb 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/src/clients/relocation-server.rb 2014-03-09 04:07:55.000000000 +0100 @@ -31,6 +31,7 @@ class RelocationServerClient < Client def main Yast.import "UI" + Yast.import "FileUtils" #** # <h3>Configuration of relocation-server</h3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/src/include/relocation-server/complex.rb new/yast2-vm-3.1.4/src/include/relocation-server/complex.rb --- old/yast2-vm-3.1.3/src/include/relocation-server/complex.rb 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/src/include/relocation-server/complex.rb 2014-03-09 04:07:55.000000000 +0100 @@ -227,7 +227,7 @@ nil end - def InitKVMFireWall + def InitLibvirtFireWall tunneled_migration = Convert.to_boolean( UI.QueryWidget(Id("tunneled_migration"), :Value) ) @@ -271,12 +271,12 @@ nil end - def InitKVMConfigurationDialog(id) + def InitLibvirtConfigurationDialog(id) UI.ChangeWidget(Id("tunneled_migration"), :Value, false) UI.ChangeWidget(Id("plain_migration"), :Value, false) UI.ChangeWidget(Id("default_port_range"), :Value, true) InitLibvirtdPortsTable() - InitKVMFireWall() + InitLibvirtFireWall() nil end @@ -364,7 +364,7 @@ nil end - def HandleKVMConfigurationDialog(id, event) + def HandleLibvirtConfigurationDialog(id, event) event = deep_copy(event) action = Ops.get(event, "ID") selected_port = Convert.to_string( @@ -381,7 +381,7 @@ elsif action == "delete_port" DeletePort(selected_port) if Confirm.DeleteSelected elsif action == "tunneled_migration" || action == "plain_migration" - InitKVMFireWall() + InitLibvirtFireWall() end @@ -389,7 +389,7 @@ nil end - def StoreKVMConfigurationDialog(id, event) + def StoreLibvirtConfigurationDialog(id, event) event = deep_copy(event) RelocationServer.SetModified diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/src/include/relocation-server/dialogs.rb new/yast2-vm-3.1.4/src/include/relocation-server/dialogs.rb --- old/yast2-vm-3.1.3/src/include/relocation-server/dialogs.rb 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/src/include/relocation-server/dialogs.rb 2014-03-09 04:07:55.000000000 +0100 @@ -131,7 +131,7 @@ ) end - def KVMConfigurationDialogContent + def LibvirtConfigurationDialogContent VBox( Frame( _("Tunneled migration"), @@ -184,7 +184,7 @@ ) ) ), - Frame(_("Firewall"), VBox("fw-kvm")) + Frame(_("Firewall"), VBox("fw-libvirt")) ) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/src/include/relocation-server/helps.rb new/yast2-vm-3.1.4/src/include/relocation-server/helps.rb --- old/yast2-vm-3.1.3/src/include/relocation-server/helps.rb 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/src/include/relocation-server/helps.rb 2014-03-09 04:07:55.000000000 +0100 @@ -59,7 +59,7 @@ "<p><b>SSL Key File/SSL Cert File</b><br>\n" + "SSL key and certificate to use for the ssl relocation interface</p>" ), - "kvm_configuration" => _( + "libvirt_configuration" => _( "<p><b><big>Tunneled migration</big></b><br>\n" + "The source host libvirtd opens a direct connection to the destination host libvirtd for sending migration data. This allows the option of encrypting the data stream.</p>\n" + "<p><b><big>Plain migration</big></b><br>\n" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/src/include/relocation-server/wizards.rb new/yast2-vm-3.1.4/src/include/relocation-server/wizards.rb --- old/yast2-vm-3.1.3/src/include/relocation-server/wizards.rb 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/src/include/relocation-server/wizards.rb 2014-03-09 04:07:55.000000000 +0100 @@ -71,24 +71,24 @@ "void (string, map)" ) }, - "kvm" => { + "libvirt" => { "widget" => :custom, - "help" => Ops.get_string(@HELPS, "kvm_configuration", ""), - "custom_widget" => KVMConfigurationDialogContent(), + "help" => Ops.get_string(@HELPS, "libvirt_configuration", ""), + "custom_widget" => LibvirtConfigurationDialogContent(), "handle" => fun_ref( - method(:HandleKVMConfigurationDialog), + method(:HandleLibvirtConfigurationDialog), "symbol (string, map)" ), "init" => fun_ref( - method(:InitKVMConfigurationDialog), + method(:InitLibvirtConfigurationDialog), "void (string)" ), "store" => fun_ref( - method(:StoreKVMConfigurationDialog), + method(:StoreLibvirtConfigurationDialog), "void (string, map)" ) }, - "fw-kvm" => CWMFirewallInterfaces.CreateOpenFirewallWidget( + "fw-libvirt" => CWMFirewallInterfaces.CreateOpenFirewallWidget( { "services" => [ "service:libvirtd-relocation-server", @@ -107,13 +107,23 @@ }, "kvm_configuration" => { "header" => _("&KVM"), - "widget_names" => ["kvm", "fw-kvm"], - "contents" => KVMConfigurationDialogContent() + "widget_names" => ["libvirt", "fw-libvirt"], + "contents" => LibvirtConfigurationDialogContent() + }, + "libxl_configuration" => { + "header" => _("&Xen Libxl"), + "widget_names" => ["libvirt", "fw-libvirt"], + "contents" => LibvirtConfigurationDialogContent() } } - if !Arch.is_xen0 + if !RelocationServer.is_xend() Builtins.remove(tabs, "xend_configuration") + if !Arch.is_kvm + Builtins.remove(tabs, "kvm_configuration") + else + Builtins.remove(tabs, "libxl_configuration") + end else Builtins.remove(tabs, "kvm_configuration") end @@ -125,9 +135,14 @@ "initial_tab" => "xend_configuration" } - if !Arch.is_xen0 - Ops.set(wd_arg, "tab_order", ["kvm_configuration"]) - Ops.set(wd_arg, "initial_tab", "kvm_configuration") + if !RelocationServer.is_xend() + if Arch.is_kvm + Ops.set(wd_arg, "tab_order", ["kvm_configuration"]) + Ops.set(wd_arg, "initial_tab", "kvm_configuration") + else + Ops.set(wd_arg, "tab_order", ["libxl_configuration"]) + Ops.set(wd_arg, "initial_tab", "libxl_configuration") + end end wd = { "tab" => CWMTab.CreateWidget(wd_arg) } @@ -184,5 +199,6 @@ UI.CloseDialog deep_copy(ret) end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.3/src/modules/RelocationServer.rb new/yast2-vm-3.1.4/src/modules/RelocationServer.rb --- old/yast2-vm-3.1.3/src/modules/RelocationServer.rb 2014-03-04 19:57:47.000000000 +0100 +++ new/yast2-vm-3.1.4/src/modules/RelocationServer.rb 2014-03-09 04:07:55.000000000 +0100 @@ -43,6 +43,7 @@ Yast.import "Summary" Yast.import "Message" Yast.import "Service" + Yast.import "FileUtils" Yast.import "SuSEFirewall" Yast.import "SuSEFirewallServices" @@ -94,6 +95,15 @@ nil end + # Determine if we are using the libxl toolstack + def is_xend + if !Arch.is_xen0 || !FileUtils.Exists("/etc/vm/xend-config.sxp") || !FileUtils.Exists("/usr/sbin/xend") + return false + end + + true + end + # Returns a confirmation popup dialog whether user wants to really abort. def Abort Popup.ReallyAbort(GetModified()) @@ -176,7 +186,12 @@ # Reads current xend status def ReadXendService - if Service.Status("xend") == 0 + xend = "/usr/sbin/xend" + retval = 1 + if FileUtils.Exists(xend) + retval = Convert.to_integer(SCR.Execute(path(".target.bash_output"), Builtins.sformat("%1 status", xend))) + end + if retval == 0 @xend_is_running = true Builtins.y2milestone("Xend is running") else @@ -222,7 +237,7 @@ nil end - def ReadKVMServices + def ReadLibvirtServices @libvirtd_enabled = Service.Enabled("libvirtd") @sshd_enabled = Service.Enabled("sshd") @@ -251,7 +266,7 @@ true end - def WriteKVMServices + def WriteLibvirtServices all_ok = true if GetLibvirtdOption("tunneled_migration") || @@ -288,7 +303,7 @@ caption = _("Initializing relocation-server Configuration") xen_steps = 3 - kvm_steps = 2 + libvirt_steps = 2 sl = 500 Builtins.sleep(sl) @@ -313,14 +328,14 @@ Message.Finished ] - kvm_stg = [ + libvirt_stg = [ # Progress stage 1/2 _("Read firewall settings"), # Progress stage 2/2 _("Read the current libvirtd/sshd state") ] - kvm_tits = [ + libvirt_tits = [ # Progress step 1/2 _("Reading firewall settings..."), # Progress stage 2/2 @@ -329,13 +344,13 @@ Message.Finished ] - if Arch.is_xen0 + if is_xend() Progress.New(caption, " ", xen_steps, xen_stg, xen_tits, "") else - Progress.New(caption, " ", kvm_steps, kvm_stg, kvm_tits, "") + Progress.New(caption, " ", libvirt_steps, libvirt_stg, libvirt_tits, "") end - if Arch.is_xen0 + if is_xend() return false if PollAbort() Progress.NextStage # Error message @@ -359,11 +374,11 @@ Progress.set(progress_state) Builtins.sleep(sl) - if Arch.is_kvm + if Arch.is_kvm || !is_xend() return false if PollAbort() Progress.NextStage # Error message - if !ReadKVMServices() + if !ReadLibvirtServices() Report.Error(_("Cannot read the current libvirtd/sshd state.")) end Builtins.sleep(sl) @@ -386,7 +401,7 @@ caption = _("Saving relocation-server Configuration") xen_steps = 3 - kvm_steps = 2 + libvirt_steps = 2 sl = 500 Builtins.sleep(sl) @@ -410,14 +425,14 @@ Message.Finished ] - kvm_stg = [ + libvirt_stg = [ # Progress stage 1 _("Adjust the libvirtd/sshd service"), # Progress stage 2 _("Write firewall settings") ] - kvm_tits = [ + libvirt_tits = [ # Progress step 1 _("Adjusting the libvirtd/sshd service"), # Progress stage 2 @@ -425,13 +440,13 @@ Message.Finished ] - if Arch.is_xen0 + if is_xend() Progress.New(caption, " ", xen_steps, xen_stg, xen_tits, "") else - Progress.New(caption, " ", kvm_steps, kvm_stg, kvm_tits, "") + Progress.New(caption, " ", libvirt_steps, libvirt_stg, libvirt_tits, "") end - if Arch.is_xen0 + if is_xend() return false if PollAbort() Progress.NextStage # Error message @@ -449,7 +464,7 @@ return false if PollAbort() Progress.NextStage # Error message - Report.Error(Message.CannotAdjustService("xend")) if !WriteKVMServices() + Report.Error(Message.CannotAdjustService("xend")) if !WriteLibvirtServices() Builtins.sleep(sl) end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
