From 249e077bb5049edf7cfbb64eb92179b854a8eff2 Mon Sep 17 00:00:00 2001 From: Alexander Trofimov Date: Thu, 23 Apr 2015 16:01:00 +0300 Subject: [PATCH] wsp-10329 Adding hyper-v replica to HyperV Provider. WebPortal Part 4. --- .../VirtualizationServerController2012.cs | 9 ++- .../WebsitePanel_SharedResources.ascx.resx | 15 +++++ .../VpsDetailsReplications.ascx.resx | 9 +-- .../VPS2012/VpsDetailsReplications.ascx | 10 ++-- .../VPS2012/VpsDetailsReplications.ascx.cs | 58 +++++++++++++------ .../VpsDetailsReplications.ascx.designer.cs | 9 --- 6 files changed, 72 insertions(+), 38 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs index a4352b0e..6c0b6a96 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs @@ -3787,6 +3787,8 @@ namespace WebsitePanel.EnterpriseServer public static ResultObject SetVmReplication(int itemId, VmReplication replication) { + TaskManager.StartTask("VPS2012", "SetVmReplication"); + ResultObject result = new ResultObject(); try { @@ -3813,8 +3815,13 @@ namespace WebsitePanel.EnterpriseServer } catch (Exception ex) { - result.AddError(VirtualizationErrorCodes.SET_REPLICATION_ERROR, ex); + throw TaskManager.WriteError(ex); } + finally + { + TaskManager.CompleteTask(); + } + TaskManager.WriteWarning("Organization with itemId '{0}' not found", itemId.ToString()); return result; } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx index 9a51773f..b60cb242 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx @@ -4097,15 +4097,30 @@ Cannot enable\set replication for the virtual machine + + Replication set\enabled for the virtual machine + Cannot disable replication for the virtual machine + + Replication disabled for the virtual machine + Cannot pause replication for the virtual machine + + Replication paused for the virtual machine + Cannot resume replication for the virtual machine + + Replication resumed for the virtual machine + + + Please fill required fields + Job execution failed with the following code: {1} diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsReplications.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsReplications.ascx.resx index 8a978a97..c95b9164 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsReplications.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsReplications.ascx.resx @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ShowProgressDialog('Gathering detailed information...', 'DetailModal'); - - - ShowProgressDialog('Updating VM replication...'); - ShowProgressDialog('Pausing VM replication...'); @@ -270,4 +264,7 @@ Please select at least one VHD + + ShowProgressDialog('Updating VM replication...'); + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx index e1f1657c..5cd780c2 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx @@ -11,7 +11,7 @@