Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1264 from mcintyre94/CA-226897

Browse Source 
[CA-226897] Resume on Server option won't automatically resume the VM
This commit is contained in:
Mihaela Stoica 2016-11-09 14:44:03 +00:00 committed by GitHub
commit 4df0c65d26
4 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs
View File

@ -56,7 +56,9 @@ namespace XenAdmin.Commands
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private readonly vm_operations _operation;
public VMOperationToolStripMenuItem(Command command, bool inContextMenu, vm_operations operation)
private readonly bool _resumeAfter;
protected VMOperationToolStripMenuItem(Command command, bool inContextMenu, vm_operations operation)
: base(command, inContextMenu)
{
if (operation != vm_operations.start_on && operation != vm_operations.resume_on && operation != vm_operations.pool_migrate)
@ -64,6 +66,9 @@ namespace XenAdmin.Commands
throw new ArgumentException("Invalid operation", "operation");
}
if (operation.Equals(vm_operations.resume_on))
_resumeAfter = true;
_operation = operation;
base.DropDownItems.Add(new ToolStripMenuItem());
}
@ -195,7 +200,7 @@ namespace XenAdmin.Commands
if (host != null)
{
VMOperationCommand cmd = new VMOperationHostCommand(Command.MainWindowCommandInterface, selection, delegate { return host; }, host.Name.EscapeAmpersands(), _operation, session);
VMOperationCommand cpmCmd = new CrossPoolMigrateCommand(Command.MainWindowCommandInterface, selection, host);
VMOperationCommand cpmCmd = new CrossPoolMigrateCommand(Command.MainWindowCommandInterface, selection, host, _resumeAfter);
VMOperationToolStripMenuSubItem tempItem = item;
Program.Invoke(Program.MainWindow, delegate

9
XenAdmin/Commands/CrossPoolMigrateCommand.cs
View File

@ -47,16 +47,18 @@ namespace XenAdmin.Commands
{
internal class CrossPoolMigrateCommand : VMOperationCommand
{
private bool _resumeAfter;
public CrossPoolMigrateCommand(IMainWindow mainWindow, IEnumerable<SelectedItem> selection)
: base(mainWindow, selection)
{ }
protected Host preSelectedHost = null;
public CrossPoolMigrateCommand(IMainWindow mainWindow, IEnumerable<SelectedItem> selection, Host preSelectedHost)
public CrossPoolMigrateCommand(IMainWindow mainWindow, IEnumerable<SelectedItem> selection, Host preSelectedHost, bool resumeAfter=false)
: base(mainWindow, selection)
{
this.preSelectedHost = preSelectedHost;
_resumeAfter = resumeAfter;
}
public override string MenuText
@ -81,10 +83,9 @@ namespace XenAdmin.Commands
}
else
{
MainWindowCommandInterface.ShowPerConnectionWizard(con,
new CrossPoolMigrateWizard(con, selection, preSelectedHost, WizardMode.Migrate));
var wizard = new CrossPoolMigrateWizard(con, selection, preSelectedHost, WizardMode.Migrate, _resumeAfter);
MainWindowCommandInterface.ShowPerConnectionWizard(con, wizard);
}
}
protected override Host GetHost(VM vm)

35
XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateWizard.cs
View File

@ -33,6 +33,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using XenAdmin.Actions;
using XenAdmin.Actions.VMActions;
using XenAdmin.Commands;
using XenAdmin.Controls;
@ -68,13 +69,17 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
private WizardMode wizardMode;
public CrossPoolMigrateWizard(IXenConnection con, IEnumerable<SelectedItem> selection, Host targetHostPreSelection, WizardMode mode)
private bool _resumeAfterMigrate;
// Note that resumeAfter is currently only implemented for Migrate mode, used for resume on server functionality
public CrossPoolMigrateWizard(IXenConnection con, IEnumerable<SelectedItem> selection, Host targetHostPreSelection, WizardMode mode, bool resumeAfterMigrate=false)
: base(con)
{
InitializeComponent();
hostPreSelection = targetHostPreSelection;
wizardMode = mode;
InitialiseWizard(selection);
_resumeAfterMigrate = resumeAfterMigrate;
}
@ -239,8 +244,32 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
if (wizardMode == WizardMode.Move && IsIntraPoolMove(pair))
new VMMoveAction(vm, pair.Value.Storage, target).RunAsync();
else
new VMCrossPoolMigrateAction(vm, target, SelectedTransferNetwork, pair.Value, wizardMode == WizardMode.Copy).RunAsync();
else
{
var isCopy = wizardMode == WizardMode.Copy;
var migrateAction =
new VMCrossPoolMigrateAction(vm, target, SelectedTransferNetwork, pair.Value, isCopy);
if (_resumeAfterMigrate)
{
var title = VMCrossPoolMigrateAction.GetTitle(vm, target, isCopy);
var startDescription = isCopy ? Messages.ACTION_VM_COPYING: Messages.ACTION_VM_MIGRATING;
var endDescription = isCopy ? Messages.ACTION_VM_COPIED: Messages.ACTION_VM_MIGRATED;
var actions = new List<AsyncAction>()
{
migrateAction,
new ResumeAndStartVMsAction(vm.Connection, target, new List<VM>{vm}, new List<VM>(), null, null)
};
new MultipleAction(vm.Connection, title, startDescription, endDescription,
actions, true, false, true).RunAsync();
}
else
{
migrateAction.RunAsync();
}
}
}
base.FinishWizard();

2
XenModel/Actions/VM/VMCrossPoolMigrateAction.cs
View File

@ -77,7 +77,7 @@ namespace XenAdmin.Actions.VMActions
}
private static string GetTitle(VM vm, Host toHost, bool copy)
public static string GetTitle(VM vm, Host toHost, bool copy)
{
if (copy)
return string.Format(Messages.ACTION_VM_CROSS_POOL_COPY_TITLE, vm.Name, toHost.Name);