Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1320 from MihaelaStoica/master

Browse Source 
CA-233454: Fix the action test
This commit is contained in:
mcintyre94 2016-12-01 13:32:11 +00:00 committed by GitHub
commit ecbf61f7c1
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdminTests/XenModelTests/ActionTests/VMActionsTest.cs
View File

@ -41,7 +41,7 @@ namespace XenAdminTests.XenModelTests.ActionTests
protected override CreateVMFastAction NewAction()
{
VM template = GetAnyUserTemplate(VmIsInstant);
return new CreateVMFastAction(template.Connection, template);
return new CreateVMFastAction(template.Connection, template, false);
}
protected override bool VerifyResult(CreateVMFastAction action)

20
XenModel/Actions/VM/CreateVMFastAction.cs
View File

@ -43,12 +43,14 @@ namespace XenAdmin.Actions.VMActions
public class CreateVMFastAction : AsyncAction
{
private readonly String _nameLabel;
private readonly bool _markVmAsBeingCreated;
public CreateVMFastAction(IXenConnection connection, VM template)
public CreateVMFastAction(IXenConnection connection, VM template, bool markVmAsBeingCreated = true)
: base(connection, Messages.INSTANT_VM_CREATE_TITLE, string.Format(Messages.INSTANT_VM_CREATE_DESCRIPTION, Helpers.DefaultVMName(Helpers.GetName(template), connection), Helpers.GetName(template)))
{
Template = template;
_nameLabel = Helpers.DefaultVMName(Helpers.GetName(Template), Connection);
_markVmAsBeingCreated = markVmAsBeingCreated;
ApiMethodsToRoleCheck.AddRange(Role.CommonTaskApiList);
ApiMethodsToRoleCheck.AddRange(Role.CommonSessionApiList);
@ -64,18 +66,26 @@ namespace XenAdmin.Actions.VMActions
PollToCompletion(0, 80);
string new_vm_ref = Result;
VM = Connection.WaitForCache(new XenRef<VM>(new_vm_ref));
VM.IsBeingCreated = true;
if (_markVmAsBeingCreated)
{
VM = Connection.WaitForCache(new XenRef<VM>(new_vm_ref));
VM.IsBeingCreated = true;
}
XenAdminConfigManager.Provider.HideObject(new_vm_ref);
RelatedTask = XenAPI.VM.async_provision(Session, new_vm_ref);
PollToCompletion(80, 90);
VM.set_name_label(Session, new_vm_ref, _nameLabel);
VM.name_label = _nameLabel; //the set_name_label method takes some time, we want to show the VM right away
XenAdminConfigManager.Provider.ShowObject(new_vm_ref);
VM.IsBeingCreated = false;
if (_markVmAsBeingCreated)
{
VM.name_label = _nameLabel; //the set_name_label method takes some time, we want to show the VM right away
VM.IsBeingCreated = false;
}
Result = new_vm_ref;
}