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

Merge pull request #747 from stephen-turner/CP-14647-2

Browse Source 
CP-14647 / CA-190904: Remove more obsolete code
This commit is contained in:
Gabor Apati-Nagy 2015-11-30 12:46:41 +00:00
commit 5d7d6e75b3
29 changed files with 103 additions and 820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/Commands/Controls/ContextMenuBuilder.cs
View File

@ -318,8 +318,6 @@ namespace XenAdmin.Commands
{
public override void Build(IMainWindow mainWindow, SelectedItemCollection selection, ContextMenuItemCollection items)
{
items.AddIfEnabled(new UpgradeSRCommand(mainWindow, selection));
items.AddIfEnabled(new ShareSRCommand(mainWindow, selection));
items.AddIfEnabled(new RepairSRCommand(mainWindow, selection));
items.AddIfEnabled(new DetachSRCommand(mainWindow, selection));
items.AddIfEnabled(new ForgetSRCommand(mainWindow, selection));
@ -923,8 +921,6 @@ namespace XenAdmin.Commands
{
items.AddIfEnabled(new RepairSRCommand(mainWindow, selection));
items.AddIfEnabled(new SetAsDefaultSRCommand(mainWindow, selection));
items.AddIfEnabled(new ShareSRCommand(mainWindow, selection));
items.AddIfEnabled(new UpgradeSRCommand(mainWindow, selection));
items.AddIfEnabled(new ConvertToThinSRCommand(mainWindow, selection));
items.AddSeparator();

97
XenAdmin/Commands/ShareSRCommand.cs
View File

@ -1,97 +0,0 @@
/* Copyright (c) Citrix Systems Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms,
* with or without modification, are permitted provided
* that the following conditions are met:
*
* * Redistributions of source code must retain the above
* copyright notice, this list of conditions and the
* following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
using XenAdmin.Core;
using XenAPI;
using XenAdmin.Actions;
using XenAdmin.Dialogs;
using System.Windows.Forms;
using System.Collections.ObjectModel;
namespace XenAdmin.Commands
{
/// <summary>
/// Shares the selected SR.
/// </summary>
internal class ShareSRCommand : Command
{
/// <summary>
/// Initializes a new instance of this Command. The parameter-less constructor is required if
/// this Command is to be attached to a ToolStrip menu item or button. It should not be used in any other scenario.
/// </summary>
public ShareSRCommand()
{
}
public ShareSRCommand(IMainWindow mainWindow, IEnumerable<SelectedItem> selection)
: base(mainWindow, selection)
{
}
public ShareSRCommand(IMainWindow mainWindow, SR sr)
: base(mainWindow, sr)
{
}
protected override void ExecuteCore(SelectedItemCollection selection)
{
foreach (SR sr in selection.AsXenObjects<SR>(CanExecute))
{
SrShareAction action = new SrShareAction(sr.Connection, sr);
ActionProgressDialog dialog = new ActionProgressDialog(action, ProgressBarStyle.Marquee);
dialog.ShowCancel = true;
dialog.ShowDialog(Parent);
}
}
protected override bool CanExecuteCore(SelectedItemCollection selection)
{
return selection.AllItemsAre<SR>() && selection.AtLeastOneXenObjectCan<SR>(CanExecute);
}
private static bool CanExecute(SR sr)
{
return sr != null && !sr.shared && sr.HasPBDs && sr.CanCreateWithXenCenter && !HelpersGUI.GetActionInProgress(sr);
}
public override string MenuText
{
get
{
return Messages.MAINWINDOW_SHARE_SR;
}
}
}
}

152
XenAdmin/Commands/UpgradeSRCommand.cs
View File

@ -1,152 +0,0 @@
/* Copyright (c) Citrix Systems Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms,
* with or without modification, are permitted provided
* that the following conditions are met:
*
* * Redistributions of source code must retain the above
* copyright notice, this list of conditions and the
* following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
using System.Collections.Generic;
using XenAdmin.Actions;
using XenAdmin.Core;
using XenAPI;
using XenAdmin.Dialogs;
namespace XenAdmin.Commands
{
/// <summary>
/// Upgrades the selected SR.
/// </summary>
internal class UpgradeSRCommand : Command
{
/// <summary>
/// Initializes a new instance of this Command. The parameter-less constructor is required if
/// this Command is to be attached to a ToolStrip menu item or button. It should not be used in any other scenario.
/// </summary>
public UpgradeSRCommand()
{
}
public UpgradeSRCommand(IMainWindow mainWindow, IEnumerable<SelectedItem> selection)
: base(mainWindow, selection)
{
}
public UpgradeSRCommand(IMainWindow mainWindow, SR selection)
: base(mainWindow, selection)
{
}
public UpgradeSRCommand(IMainWindow mainWindow, IEnumerable<SR> selection)
: base(mainWindow, ConvertToSelection<SR>(selection))
{
}
protected override void ExecuteCore(SelectedItemCollection selection)
{
List<AsyncAction> actions = new List<AsyncAction>();
foreach (SR sr in selection.AsXenObjects<SR>(CanExecute))
{
actions.Add(new SrAction(SrActionKind.UpgradeLVM, sr));
}
RunMultipleActions(actions, Messages.ACTION_SRS_UPGRADE, Messages.ACTION_SRS_UPGRADING, Messages.ACTION_SRS_UPGRADED, true);
}
protected override bool CanExecuteCore(SelectedItemCollection selection)
{
return selection.AllItemsAre<SR>() && selection.AtLeastOneXenObjectCan<SR>(CanExecute);
}
private static bool CanExecute(SR sr)
{
return sr.NeedsUpgrading && !HelpersGUI.GetActionInProgress(sr);
}
public override string MenuText
{
get
{
return Messages.MAINWINDOW_UPGRADE_SR;
}
}
protected override bool ConfirmationRequired
{
get
{
return true;
}
}
protected override string ConfirmationDialogTitle
{
get
{
if (GetSelection().Count == 1)
{
return Messages.UPGRADE_SR_PROMPT_TITLE;
}
return Messages.UPGRADE_SRS_PROMPT_TITLE;
}
}
protected override string ConfirmationDialogText
{
get
{
if (GetSelection().Count == 1)
{
return Messages.UPGRADE_SR_PROMPT;
}
return Messages.UPGRADE_SRS_PROMPT;
}
}
protected override CommandErrorDialog GetErrorDialogCore(IDictionary<SelectedItem, string> cantExecuteReasons)
{
return new CommandErrorDialog(Messages.ERROR_DIALOG_UPGRADE_SR_TITLE, Messages.ERROR_DIALOG_UPGRADE_SR_TEXT, cantExecuteReasons);
}
protected override string GetCantExecuteReasonCore(SelectedItem item)
{
SR sr = item.XenObject as SR;
if (sr == null)
{
return base.GetCantExecuteReasonCore(item);
}
if (!sr.NeedsUpgrading)
{
return Messages.SR_DOES_NOT_NEED_UPGRADE;
}
else if (HelpersGUI.GetActionInProgress(sr))
{
return Messages.SR_ACTION_IN_PROGRESS;
}
return base.GetCantExecuteReasonCore(item);
}
}
}

1
XenAdmin/Images.cs
View File

@ -95,7 +95,6 @@ namespace XenAdmin
ImageList16.Images.Add("000_StorageBroken_h32bit_16.png", XenAdmin.Properties.Resources._000_StorageBroken_h32bit_16);
ImageList16.Images.Add("000_StorageDefault_h32bit_16.png", XenAdmin.Properties.Resources._000_StorageDefault_h32bit_16);
ImageList16.Images.Add("000_StorageDisabled_h32bit_16.png", XenAdmin.Properties.Resources._000_StorageDisabled_h32bit_16);
ImageList16.Images.Add("000_StorageNeedsUpgrading_h32bit_16.png", XenAdmin.Properties.Resources._000_StorageNeedsUpgrading_h32bit_16);
ImageList16.Images.Add("001_ShutDown_h32bit_16.png", Properties.Resources._001_ShutDown_h32bit_16);
ImageList16.Images.Add("000_paused_h32bit_16.png", Properties.Resources._000_paused_h32bit_16);

BIN
XenAdmin/Images/000_StorageNeedsUpgrading_h32bit_16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 879 B

39
XenAdmin/MainWindow.Designer.cs generated
View File

@ -146,7 +146,6 @@ namespace XenAdmin
this.removeServerToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.poolReconnectAsToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.disconnectPoolToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.exportResourceReportPoolToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator();
this.virtualAppliancesToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.toolStripSeparator30 = new System.Windows.Forms.ToolStripSeparator();
@ -155,6 +154,7 @@ namespace XenAdmin
this.drConfigureToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.DrWizardToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.vMProtectionAndRecoveryToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.exportResourceReportPoolToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.wlbReportsToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.wlbDisconnectToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@ -224,8 +224,6 @@ namespace XenAdmin
this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
this.RepairStorageToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.DefaultSRToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.shareStorageRepositoryToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.upgradeStorageRepositoryToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.virtualDisksToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.addVirtualDiskToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
@ -254,6 +252,7 @@ namespace XenAdmin
this.templatePropertiesToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.bugToolToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.healthCheckToolStripMenuItem1 = new XenAdmin.Commands.CommandToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.LicenseManagerMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
@ -271,17 +270,16 @@ namespace XenAdmin
this.viewApplicationLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem17 = new System.Windows.Forms.ToolStripSeparator();
this.xenSourceOnTheWebToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.xenCenterPluginsOnlineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.pluginItemsPlaceHolderToolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
this.aboutXenSourceAdminToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.xenCenterPluginsOnlineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MainMenuBar = new XenAdmin.Controls.MenuStripEx();
this.securityGroupsToolStripMenuItem = new XenAdmin.Commands.CommandToolStripMenuItem();
this.MenuPanel = new System.Windows.Forms.Panel();
this.StatusStrip = new System.Windows.Forms.StatusStrip();
this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.statusProgressBar = new System.Windows.Forms.ToolStripProgressBar();
this.healthCheckToolStripMenuItem1 = new XenAdmin.Commands.CommandToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@ -1420,8 +1418,6 @@ namespace XenAdmin
this.toolStripSeparator22,
this.RepairStorageToolStripMenuItem,
this.DefaultSRToolStripMenuItem,
this.shareStorageRepositoryToolStripMenuItem,
this.upgradeStorageRepositoryToolStripMenuItem,
this.toolStripSeparator2,
this.virtualDisksToolStripMenuItem,
this.reclaimFreedSpacetripMenuItem,
@ -1463,18 +1459,6 @@ namespace XenAdmin
this.DefaultSRToolStripMenuItem.Name = "DefaultSRToolStripMenuItem";
resources.ApplyResources(this.DefaultSRToolStripMenuItem, "DefaultSRToolStripMenuItem");
//
// shareStorageRepositoryToolStripMenuItem
//
this.shareStorageRepositoryToolStripMenuItem.Command = new XenAdmin.Commands.ShareSRCommand();
this.shareStorageRepositoryToolStripMenuItem.Name = "shareStorageRepositoryToolStripMenuItem";
resources.ApplyResources(this.shareStorageRepositoryToolStripMenuItem, "shareStorageRepositoryToolStripMenuItem");
//
// upgradeStorageRepositoryToolStripMenuItem
//
this.upgradeStorageRepositoryToolStripMenuItem.Command = new XenAdmin.Commands.UpgradeSRCommand();
this.upgradeStorageRepositoryToolStripMenuItem.Name = "upgradeStorageRepositoryToolStripMenuItem";
resources.ApplyResources(this.upgradeStorageRepositoryToolStripMenuItem, "upgradeStorageRepositoryToolStripMenuItem");
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
@ -1535,9 +1519,8 @@ namespace XenAdmin
this.DestroyStorageRepositoryToolStripMenuItem.Command = new XenAdmin.Commands.DestroySRCommand();
this.DestroyStorageRepositoryToolStripMenuItem.Name = "DestroyStorageRepositoryToolStripMenuItem";
resources.ApplyResources(this.DestroyStorageRepositoryToolStripMenuItem, "DestroyStorageRepositoryToolStripMenuItem");
//
// ConvertStorageRepositoryToolStripMenuItem
// ConvertToThinStorageRepositoryToolStripMenuItem
//
this.ConvertToThinStorageRepositoryToolStripMenuItem.Command = new XenAdmin.Commands.ConvertToThinSRCommand();
this.ConvertToThinStorageRepositoryToolStripMenuItem.Name = "ConvertToThinStorageRepositoryToolStripMenuItem";
@ -1665,6 +1648,12 @@ namespace XenAdmin
this.bugToolToolStripMenuItem.Name = "bugToolToolStripMenuItem";
resources.ApplyResources(this.bugToolToolStripMenuItem, "bugToolToolStripMenuItem");
//
// healthCheckToolStripMenuItem1
//
this.healthCheckToolStripMenuItem1.Command = new XenAdmin.Commands.HealthCheckCommand();
this.healthCheckToolStripMenuItem1.Name = "healthCheckToolStripMenuItem1";
resources.ApplyResources(this.healthCheckToolStripMenuItem1, "healthCheckToolStripMenuItem1");
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
@ -1848,12 +1837,6 @@ namespace XenAdmin
this.statusProgressBar.Name = "statusProgressBar";
this.statusProgressBar.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;
//
// healthCheckToolStripMenuItem1
//
this.healthCheckToolStripMenuItem1.Command = new XenAdmin.Commands.HealthCheckCommand();
this.healthCheckToolStripMenuItem1.Name = "healthCheckToolStripMenuItem1";
resources.ApplyResources(this.healthCheckToolStripMenuItem1, "healthCheckToolStripMenuItem1");
//
// MainWindow
//
resources.ApplyResources(this, "$this");
@ -1973,8 +1956,6 @@ namespace XenAdmin
private System.Windows.Forms.ToolStripSeparator toolStripSeparator22;
private CommandToolStripMenuItem RepairStorageToolStripMenuItem;
private CommandToolStripMenuItem DefaultSRToolStripMenuItem;
private CommandToolStripMenuItem shareStorageRepositoryToolStripMenuItem;
private CommandToolStripMenuItem upgradeStorageRepositoryToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator19;
private CommandToolStripMenuItem DetachStorageToolStripMenuItem;
private CommandToolStripMenuItem ReattachStorageRepositoryToolStripMenuItem;

49
XenAdmin/MainWindow.resx
View File

@ -2100,13 +2100,13 @@
<value>Remove Crash &amp;Dump Files</value>
</data>
<data name="ChangeRootPasswordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 22</value>
<value>161, 22</value>
</data>
<data name="ChangeRootPasswordToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Change...</value>
</data>
<data name="forgetSavedPasswordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>124, 22</value>
<value>161, 22</value>
</data>
<data name="forgetSavedPasswordToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Forget Password</value>
@ -2303,18 +2303,6 @@
<data name="DefaultSRToolStripMenuItem.Text" xml:space="preserve">
<value>Set as Defaul&amp;t</value>
</data>
<data name="shareStorageRepositoryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 22</value>
</data>
<data name="shareStorageRepositoryToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Share</value>
</data>
<data name="upgradeStorageRepositoryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 22</value>
</data>
<data name="upgradeStorageRepositoryToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Upgrade</value>
</data>
<data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 6</value>
</data>
@ -2369,6 +2357,9 @@
<data name="DestroyStorageRepositoryToolStripMenuItem.Text" xml:space="preserve">
<value>Destr&amp;oy</value>
</data>
<data name="ConvertToThinStorageRepositoryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 22</value>
</data>
<data name="toolStripSeparator18.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 6</value>
</data>
@ -3476,18 +3467,6 @@
<data name="&gt;&gt;DefaultSRToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;shareStorageRepositoryToolStripMenuItem.Name" xml:space="preserve">
<value>shareStorageRepositoryToolStripMenuItem</value>
</data>
<data name="&gt;&gt;shareStorageRepositoryToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;upgradeStorageRepositoryToolStripMenuItem.Name" xml:space="preserve">
<value>upgradeStorageRepositoryToolStripMenuItem</value>
</data>
<data name="&gt;&gt;upgradeStorageRepositoryToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;toolStripSeparator2.Name" xml:space="preserve">
<value>toolStripSeparator2</value>
</data>
@ -3548,6 +3527,12 @@
<data name="&gt;&gt;DestroyStorageRepositoryToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ConvertToThinStorageRepositoryToolStripMenuItem.Name" xml:space="preserve">
<value>ConvertToThinStorageRepositoryToolStripMenuItem</value>
</data>
<data name="&gt;&gt;ConvertToThinStorageRepositoryToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;toolStripSeparator18.Name" xml:space="preserve">
<value>toolStripSeparator18</value>
</data>
@ -3650,6 +3635,12 @@
<data name="&gt;&gt;bugToolToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;healthCheckToolStripMenuItem1.Name" xml:space="preserve">
<value>healthCheckToolStripMenuItem1</value>
</data>
<data name="&gt;&gt;healthCheckToolStripMenuItem1.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;toolStripSeparator14.Name" xml:space="preserve">
<value>toolStripSeparator14</value>
</data>
@ -3794,12 +3785,6 @@
<data name="&gt;&gt;statusProgressBar.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;healthCheckToolStripMenuItem1.Name" xml:space="preserve">
<value>healthCheckToolStripMenuItem1</value>
</data>
<data name="&gt;&gt;healthCheckToolStripMenuItem1.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainWindow</value>
</data>

10
XenAdmin/Properties/Resources.Designer.cs generated
View File

@ -1090,16 +1090,6 @@ namespace XenAdmin.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _000_StorageNeedsUpgrading_h32bit_16 {
get {
object obj = ResourceManager.GetObject("_000_StorageNeedsUpgrading_h32bit_16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
XenAdmin/Properties/Resources.ja.resx
View File

@ -733,9 +733,6 @@
<data name="_000_StorageDisabled_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_StorageDisabled_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_StorageNeedsUpgrading_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_StorageNeedsUpgrading_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_Storage_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_Storage_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

3
XenAdmin/Properties/Resources.resx
View File

@ -328,9 +328,6 @@
<data name="_001_Back_h32bit_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\001_Back_h32bit_24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_StorageNeedsUpgrading_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_StorageNeedsUpgrading_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_Fields_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_Fields_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

3
XenAdmin/Properties/Resources.zh-CN.resx
View File

@ -754,9 +754,6 @@
<data name="sl_add_storage_system_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\sl_add_storage_system_32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_StorageNeedsUpgrading_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_StorageNeedsUpgrading_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_CPU_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_CPU_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

9
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -684,20 +684,17 @@ namespace XenAdmin.TabPages
PDSection s = pdSectionStatus;
bool broken = sr.IsBroken() || !sr.MultipathAOK || sr.NeedsUpgrading;
bool broken = sr.IsBroken() || !sr.MultipathAOK;
bool detached = !sr.HasPBDs;
ToolStripMenuItem repair = new ToolStripMenuItem
{
Text = sr.NeedsUpgrading ? Messages.UPGRADE_SR : Messages.GENERAL_SR_CONTEXT_REPAIR,
Text = Messages.GENERAL_SR_CONTEXT_REPAIR,
Image = Properties.Resources._000_StorageBroken_h32bit_16
};
repair.Click += delegate
{
if (sr.NeedsUpgrading)
new UpgradeSRCommand(Program.MainWindow, sr).Execute();
else
Program.MainWindow.ShowPerConnectionWizard(xenObject.Connection, new RepairSRDialog(sr));
Program.MainWindow.ShowPerConnectionWizard(xenObject.Connection, new RepairSRDialog(sr));
};
var menuItems = new[] { repair };

44
XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.Designer.cs generated
View File

@ -34,14 +34,14 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RollingUpgradeWizardSelectPool));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView1 = new XenAdmin.Wizards.RollingUpgradeWizard.RollingUpgradeWizardSelectPool.UpgradeDataGridView(this.components);
this.label1 = new System.Windows.Forms.Label();
this.buttonSelectAll = new System.Windows.Forms.Button();
this.buttonClearAll = new System.Windows.Forms.Button();
this.expansionColumn = new System.Windows.Forms.DataGridViewImageColumn();
this.checkBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Description = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnVersion = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.label1 = new System.Windows.Forms.Label();
this.buttonSelectAll = new System.Windows.Forms.Button();
this.buttonClearAll = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
@ -61,25 +61,6 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
this.dataGridView1.ReadOnly = true;
this.dataGridView1.Updating = false;
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// buttonSelectAll
//
resources.ApplyResources(this.buttonSelectAll, "buttonSelectAll");
this.buttonSelectAll.Name = "buttonSelectAll";
this.buttonSelectAll.UseVisualStyleBackColor = true;
this.buttonSelectAll.Click += new System.EventHandler(this.buttonSelectAll_Click);
//
// buttonClearAll
//
resources.ApplyResources(this.buttonClearAll, "buttonClearAll");
this.buttonClearAll.Name = "buttonClearAll";
this.buttonClearAll.UseVisualStyleBackColor = true;
this.buttonClearAll.Click += new System.EventHandler(this.buttonClearAll_Click);
//
// expansionColumn
//
this.expansionColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
@ -126,6 +107,25 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
this.ColumnVersion.Name = "ColumnVersion";
this.ColumnVersion.ReadOnly = true;
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
// buttonSelectAll
//
resources.ApplyResources(this.buttonSelectAll, "buttonSelectAll");
this.buttonSelectAll.Name = "buttonSelectAll";
this.buttonSelectAll.UseVisualStyleBackColor = true;
this.buttonSelectAll.Click += new System.EventHandler(this.buttonSelectAll_Click);
//
// buttonClearAll
//
resources.ApplyResources(this.buttonClearAll, "buttonClearAll");
this.buttonClearAll.Name = "buttonClearAll";
this.buttonClearAll.UseVisualStyleBackColor = true;
this.buttonClearAll.Click += new System.EventHandler(this.buttonClearAll_Click);
//
// RollingUpgradeWizardSelectPool
//
this.Controls.Add(this.buttonClearAll);

48
XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.resx
View File

@ -112,19 +112,19 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="dataGridView1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<metadata name="expansionColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="expansionColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="dataGridViewCellStyle1.NullValue" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Qk32AgAAAAAAADYAAAAoAAAADgAAABAAAAABABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@ -145,14 +145,14 @@
<data name="expansionColumn.HeaderText" xml:space="preserve">
<value />
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="expansionColumn.MinimumWidth" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="expansionColumn.Width" type="System.Int32, mscorlib">
<value>20</value>
</data>
<metadata name="checkBoxColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="checkBoxColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="checkBoxColumn.HeaderText" xml:space="preserve">
@ -164,7 +164,7 @@
<data name="checkBoxColumn.Width" type="System.Int32, mscorlib">
<value>24</value>
</data>
<metadata name="NameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="NameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="NameColumn.HeaderText" xml:space="preserve">
@ -173,7 +173,7 @@
<data name="NameColumn.MinimumWidth" type="System.Int32, mscorlib">
<value>30</value>
</data>
<metadata name="Description.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Description.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="Description.HeaderText" xml:space="preserve">
@ -182,7 +182,7 @@
<data name="Description.MinimumWidth" type="System.Int32, mscorlib">
<value>30</value>
</data>
<metadata name="ColumnVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ColumnVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="ColumnVersion.HeaderText" xml:space="preserve">
@ -192,10 +192,10 @@
<value>130</value>
</data>
<data name="dataGridView1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 53</value>
<value>0, 26</value>
</data>
<data name="dataGridView1.Size" type="System.Drawing.Size, System.Drawing">
<value>520, 292</value>
<value>520, 319</value>
</data>
<data name="dataGridView1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -222,21 +222,19 @@
<value>0, 0</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>520, 50</value>
<value>520, 23</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Select the resource pools and/or standalone servers that you want to upgrade and then click Next.
Note: it is not possible to upgrade pools or servers running XenServer version 5.5 or earlier using this wizard.</value>
<value>Select the resource pools and/or standalone servers that you want to upgrade and then click Next.</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>$this</value>
@ -266,7 +264,7 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5
<value>buttonSelectAll</value>
</data>
<data name="&gt;&gt;buttonSelectAll.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonSelectAll.Parent" xml:space="preserve">
<value>$this</value>
@ -296,7 +294,7 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5
<value>buttonClearAll</value>
</data>
<data name="&gt;&gt;buttonClearAll.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;buttonClearAll.Parent" xml:space="preserve">
<value>$this</value>
@ -304,7 +302,7 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5
<data name="&gt;&gt;buttonClearAll.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
@ -314,31 +312,31 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5
<value>expansionColumn</value>
</data>
<data name="&gt;&gt;expansionColumn.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;checkBoxColumn.Name" xml:space="preserve">
<value>checkBoxColumn</value>
</data>
<data name="&gt;&gt;checkBoxColumn.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;NameColumn.Name" xml:space="preserve">
<value>NameColumn</value>
</data>
<data name="&gt;&gt;NameColumn.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Description.Name" xml:space="preserve">
<value>Description</value>
</data>
<data name="&gt;&gt;Description.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ColumnVersion.Name" xml:space="preserve">
<value>ColumnVersion</value>
</data>
<data name="&gt;&gt;ColumnVersion.Type" xml:space="preserve">
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>RollingUpgradeWizardSelectPool</value>

8
XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.Designer.cs generated
View File

@ -34,7 +34,6 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
this.label1 = new System.Windows.Forms.Label();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
@ -53,7 +52,6 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
//
// label2
@ -61,11 +59,6 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
// label6
//
resources.ApplyResources(this.label6, "label6");
@ -111,7 +104,6 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.PictureBox pictureBox1;

70
XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.resx
View File

@ -112,16 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value>
</data>
@ -138,7 +138,7 @@
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -155,7 +155,7 @@
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -175,7 +175,7 @@
<value>label2</value>
</data>
<data name="&gt;&gt;label2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label2.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -183,36 +183,6 @@
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 82</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>588, 52</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>You can use this wizard to upgrade servers from Citrix XenServer version 5.6 or later to the current version of XenServer. Servers running older versions of XenServer will need to be individually upgraded through each intermediate release until they are at version 5.6; you will then be able to carry out a rolling pool upgrade to bring them all up to the current XenServer version.</value>
</data>
<data name="&gt;&gt;label3.Name" xml:space="preserve">
<value>label3</value>
</data>
<data name="&gt;&gt;label3.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label3.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
@ -220,10 +190,10 @@
<value>0, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<value>3</value>
<value>2</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>600, 164</value>
<value>600, 82</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -232,7 +202,7 @@
<value>tableLayoutPanel1</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
@ -241,7 +211,7 @@
<value>4</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Absolute,40,Absolute,42,Absolute,82,Absolute,20,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="Absolute,40,Absolute,42,Absolute,20,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="label6.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -250,7 +220,7 @@
<value>Microsoft Sans Serif, 9pt, style=Bold</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>56, 205</value>
<value>42, 123</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 15</value>
@ -265,7 +235,7 @@
<value>label6</value>
</data>
<data name="&gt;&gt;label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label6.Parent" xml:space="preserve">
<value>$this</value>
@ -277,7 +247,7 @@
<value>Top, Left, Right</value>
</data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>56, 230</value>
<value>42, 148</value>
</data>
<data name="label7.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 10, 3, 0</value>
@ -295,7 +265,7 @@
<value>label7</value>
</data>
<data name="&gt;&gt;label7.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label7.Parent" xml:space="preserve">
<value>$this</value>
@ -304,7 +274,7 @@
<value>2</value>
</data>
<data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>18, 205</value>
<value>4, 123</value>
</data>
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>32, 32</value>
@ -319,7 +289,7 @@
<value>pictureBox1</value>
</data>
<data name="&gt;&gt;pictureBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBox1.Parent" xml:space="preserve">
<value>$this</value>
@ -334,7 +304,7 @@
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
</data>
<data name="labelRunningOnBattery.Location" type="System.Drawing.Point, System.Drawing">
<value>56, 292</value>
<value>42, 210</value>
</data>
<data name="labelRunningOnBattery.Size" type="System.Drawing.Size, System.Drawing">
<value>533, 34</value>
@ -352,7 +322,7 @@
<value>labelRunningOnBattery</value>
</data>
<data name="&gt;&gt;labelRunningOnBattery.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;labelRunningOnBattery.Parent" xml:space="preserve">
<value>$this</value>
@ -360,7 +330,7 @@
<data name="&gt;&gt;labelRunningOnBattery.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">

8
XenAdmin/XenAdmin.csproj
View File

@ -241,7 +241,7 @@
<Compile Include="Dialogs\ConvertToThinSRDialog.Designer.cs">
<DependentUpon>ConvertToThinSRDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\OptionsPages\SaveAndRestoreOptionsPage.cs">
<Compile Include="Dialogs\OptionsPages\SaveAndRestoreOptionsPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Dialogs\OptionsPages\SaveAndRestoreOptionsPage.Designer.cs">
@ -1531,7 +1531,7 @@
<EmbeddedResource Include="Dialogs\AdPasswordPrompt.resx">
<SubType>Designer</SubType>
<DependentUpon>AdPasswordPrompt.cs</DependentUpon>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\HealthCheck\HealthCheckOverviewDialog.ja.resx">
<DependentUpon>HealthCheckOverviewDialog.cs</DependentUpon>
</EmbeddedResource>
@ -1568,7 +1568,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\ConvertToThinSRDialog.zh-CN.resx">
<DependentUpon>ConvertToThinSRDialog.cs</DependentUpon>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\OptionsPages\SaveAndRestoreOptionsPage.ja.resx">
<DependentUpon>SaveAndRestoreOptionsPage.cs</DependentUpon>
</EmbeddedResource>
@ -3082,7 +3082,6 @@
<Compile Include="Commands\SelectedItemCollection.cs" />
<Compile Include="Commands\SelectionBroadcaster.cs" />
<Compile Include="Commands\SetAsDefaultSRCommand.cs" />
<Compile Include="Commands\ShareSRCommand.cs" />
<Compile Include="Commands\ShutDownCommand.cs">
</Compile>
<Compile Include="Commands\ShutDownHostCommand.cs">
@ -3103,7 +3102,6 @@
</Compile>
<Compile Include="Commands\SuspendVMCommand.cs" />
<Compile Include="Commands\TakeSnapshotCommand.cs" />
<Compile Include="Commands\UpgradeSRCommand.cs" />
<Compile Include="Commands\ViewWorkloadReportsCommand.cs">
</Compile>
<Compile Include="Commands\VirtualDiskCommand.cs" />

12
XenAdmin/XenSearch/Columns.cs
View File

@ -189,18 +189,6 @@ namespace XenAdmin.XenSearch
return true;
}
SR sr = o as SR;
if (sr != null && sr.NeedsUpgrading)
{
if (property == PropertyNames.memoryValue)
item = new GridStringItem(Messages.UPGRADE_SR_WARNING,
HorizontalAlignment.Center, VerticalAlignment.Middle, false, false,
QueryPanel.LinkBrush, Program.DefaultFontUnderline, QueryPanel.LinkBrush, Program.DefaultFontUnderline, 3,
(sender, args) => new UpgradeSRCommand(Program.MainWindow, sr).Execute(), null);
return true;
}
Pool pool = o as Pool;
if (pool != null && !pool.IsPoolFullyUpgraded)
{

15
XenModel/Actions/SR/SrAction.cs
View File

@ -37,7 +37,7 @@ using System.Collections.Generic;
namespace XenAdmin.Actions
{
public enum SrActionKind { SetAsDefault, Detach, Forget, Destroy, UpgradeLVM, UnplugAndDestroyPBDs, ConvertToThin };
public enum SrActionKind { SetAsDefault, Detach, Forget, Destroy, UnplugAndDestroyPBDs, ConvertToThin };
public class SrAction : PureAsyncAction
{
@ -86,10 +86,6 @@ namespace XenAdmin.Actions
return String.Format(Messages.ACTION_SR_FORGETTING,
sr.Name, Helpers.GetName(sr.Connection));
case SrActionKind.UpgradeLVM:
return String.Format(Messages.ACTION_SR_CONVERT,
sr.Name, Helpers.GetName(sr.Connection));
case SrActionKind.ConvertToThin:
return String.Format(Messages.ACTION_SR_CONVERT_TO_THIN,
sr.NameWithLocation);
@ -158,15 +154,6 @@ namespace XenAdmin.Actions
Description = Messages.ACTION_SR_SET_DEFAULT_SUCCESSFUL;
break;
case SrActionKind.UpgradeLVM:
Description = Messages.ACTION_SR_CONVERTING;
XenAPI.SR.remove_from_sm_config(Session, SR.opaque_ref, XenAPI.SR.USE_VHD);
XenAPI.SR.add_to_sm_config(Session, SR.opaque_ref, XenAPI.SR.USE_VHD, "true");
Description = Messages.ACTION_SR_CONVERTED;
break;
case SrActionKind.UnplugAndDestroyPBDs:
UnplugPBDs(ref inc);
DestroyPBDs(ref inc);

2
XenModel/Actions/SR/SrIntroduceAction.cs
View File

@ -60,7 +60,7 @@ namespace XenAdmin.Actions
_srDescription = srDescription;
_srContentType = srContentType;
_srType = srType;
_srIsShared = true; // used to depend on restrict_pool_attached_storage flag: now always true
_srIsShared = true; // used to depend on restrict_pool_attached_storage flag: now always true, but left in in case we want to create local SRs one day
_dconf = dconf;
}

96
XenModel/Actions/SR/SrShareAction.cs
View File

@ -1,96 +0,0 @@
/* Copyright (c) Citrix Systems Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms,
* with or without modification, are permitted provided
* that the following conditions are met:
*
* * Redistributions of source code must retain the above
* copyright notice, this list of conditions and the
* following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
using System;
using XenAdmin.Network;
using XenAPI;
namespace XenAdmin.Actions
{
/// <summary>
/// Turns an unshared SR into a shared SR.
/// </summary>
public class SrShareAction : SrRepairAction
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public SrShareAction(IXenConnection connection, SR sr)
: base(connection, sr,true)
{
}
protected override void Run()
{
try
{
Description = string.Format(Messages.SR_SHARE_SETTING, SR.Name);
XenAPI.SR.set_shared(Session, SR.opaque_ref, true);
base.Run();
}
catch
{
rollback();
throw;
}
}
/// <summary>
/// Destroys any PBDs on the SR and sets the SR to be unshared.
///
/// No throw.
/// </summary>
private void rollback()
{
try
{
Description = string.Format(Messages.SR_SHARE_REVERTING2, SR.Name);
foreach (PBD broke in Connection.ResolveAll(SR.PBDs))
{
if (!broke.currently_attached && !broke.Locked)
PBD.destroy(Session, broke.opaque_ref);
}
XenAPI.SR.set_shared(Session, SR.opaque_ref, false);
Description = string.Format(Messages.SR_SHARE_REVERTED, SR.Name);
}
catch (Exception e)
{
log.Error("Exception rolling back SR shared action");
log.Error(e,e);
}
}
}
}

2
XenModel/Actions/StorageLink/SrCreateAction.cs
View File

@ -74,7 +74,7 @@ namespace XenAdmin.Actions
_srDescription = srDescription;
_srType = srType;
_srContentType = srContentType;
_srIsShared = true; // used to depend on restrict_pool_attached_storage flag: now always true
_srIsShared = true; // used to depend on restrict_pool_attached_storage flag: now always true, but left in in case we want to create local SRs one day
_dconf = dconf;
_smconf = smconf;

1
XenModel/Icons.cs
View File

@ -68,7 +68,6 @@ namespace XenAdmin
StorageBroken,
StorageDefault,
StorageDisabled,
StorageNeedsUpgrading,
PowerStateHalted,
PowerStateSuspended,

106
XenModel/Messages.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -13396,24 +13396,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to The following storage repositories were not upgraded:.
/// </summary>
public static string ERROR_DIALOG_UPGRADE_SR_TEXT {
get {
return ResourceManager.GetString("ERROR_DIALOG_UPGRADE_SR_TEXT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Error Upgrading Storage Repository.
/// </summary>
public static string ERROR_DIALOG_UPGRADE_SR_TITLE {
get {
return ResourceManager.GetString("ERROR_DIALOG_UPGRADE_SR_TITLE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to File {0} not found.
/// </summary>
@ -20450,15 +20432,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to &amp;Upgrade.
/// </summary>
public static string MAINWINDOW_UPGRADE_SR {
get {
return ResourceManager.GetString("MAINWINDOW_UPGRADE_SR", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to XVA Files (*.xva)|*.xva|All Files (*.*)|*.*.
/// </summary>
@ -28216,16 +28189,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to There are VMs using StorageLink Gateway.
///Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if the VMs are shut down and using NetApp, Dell EqualLogic or SMI-S adapters..
/// </summary>
public static string ROLLING_UPGRADE_WARNING_SL {
get {
return ResourceManager.GetString("ROLLING_UPGRADE_WARNING_SL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Upgrade prechecks are performed on all the pools you selected to ensure that all the servers can be upgraded..
/// </summary>
@ -29496,15 +29459,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Snapshots require XenServer 5.5 or later.
/// </summary>
public static string SNAPSHOT_REQUIRE_GEORGE {
get {
return ResourceManager.GetString("SNAPSHOT_REQUIRE_GEORGE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Snapshot revert.
/// </summary>
@ -32747,64 +32701,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Upgrade....
/// </summary>
public static string UPGRADE_SR {
get {
return ResourceManager.GetString("UPGRADE_SR", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to If you upgrade this storage repository, you will no longer be able to use it with XenServer 5.0.
///
///Do you want to continue?.
/// </summary>
public static string UPGRADE_SR_PROMPT {
get {
return ResourceManager.GetString("UPGRADE_SR_PROMPT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Upgrade Storage Repository.
/// </summary>
public static string UPGRADE_SR_PROMPT_TITLE {
get {
return ResourceManager.GetString("UPGRADE_SR_PROMPT_TITLE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This SR needs upgrading.
/// </summary>
public static string UPGRADE_SR_WARNING {
get {
return ResourceManager.GetString("UPGRADE_SR_WARNING", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to If you upgrade these storage repositories, you will no longer be able to use them with XenServer 5.0.
///
///Do you want to continue?.
/// </summary>
public static string UPGRADE_SRS_PROMPT {
get {
return ResourceManager.GetString("UPGRADE_SRS_PROMPT", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Upgrade Multiple Storage Repositories.
/// </summary>
public static string UPGRADE_SRS_PROMPT_TITLE {
get {
return ResourceManager.GetString("UPGRADE_SRS_PROMPT_TITLE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Apply Upgrade.
/// </summary>

38
XenModel/Messages.ja.resx
View File

@ -4460,12 +4460,6 @@ CD をイジェクトしてから再試行してください。</value>
<data name="ERROR_DIALOG_SUSPEND_VM_TITLE" xml:space="preserve">
<value>VM の一時停止エラー</value>
</data>
<data name="ERROR_DIALOG_UPGRADE_SR_TEXT" xml:space="preserve">
<value>以下のストレージ リポジトリはアップグレードされていません。</value>
</data>
<data name="ERROR_DIALOG_UPGRADE_SR_TITLE" xml:space="preserve">
<value>ストレージ リポジトリのアップグレード エラー</value>
</data>
<data name="ERROR_FILE_NOT_FOUND" xml:space="preserve">
<value>ファイル {0} が見つかりません</value>
</data>
@ -6786,9 +6780,6 @@ SCSI ID: {2}
<data name="MAINWINDOW_TRIM_SR" xml:space="preserve">
<value>空き領域の解放(&amp;C)</value>
</data>
<data name="MAINWINDOW_UPGRADE_SR" xml:space="preserve">
<value>アップグレード(&amp;U)</value>
</data>
<data name="MAINWINDOW_XVA_BLURB" xml:space="preserve">
<value>XVA ファイル (*.xva)|*.xva|すべてのファイル (*.*)|*.*</value>
</data>
@ -9369,10 +9360,6 @@ XenServer では、CPU の一部の機能をマスタに合わせて無効にす
<data name="ROLLING_UPGRADE_UPGRADE_NOT_COMPLETED" xml:space="preserve">
<value>プールのローリング アップグレードが完了しませんでした。</value>
</data>
<data name="ROLLING_UPGRADE_WARNING_SL" xml:space="preserve">
<value>StorageLink Gateway を使用している VM があります。
StorageLink Gateway を使用する VM の XenServer 6.0 へのアップグレードは、VM がシャットダウン状態で NetApp、Dell EqualLogic、または SMI-S アダプタを使用する場合のみサポートされます。</value>
</data>
<data name="RPU_WARNING_DESCRIPTION_CLEARWATER_OR_GREATER" xml:space="preserve">
<value>'{0}': 新しいバージョンの XenServer を使用するには、新しいライセンスをライセンス サーバーに追加する必要があります。</value>
</data>
@ -9806,9 +9793,6 @@ StorageLink Gateway を使用する VM の XenServer 6.0 へのアップグレ
<data name="SNAPSHOT_OF" xml:space="preserve">
<value>スナップショット作成元</value>
</data>
<data name="SNAPSHOT_REQUIRE_GEORGE" xml:space="preserve">
<value>スナップショットは、XenServer 5.5 以降でサポートされます</value>
</data>
<data name="SNAPSHOT_REVERT" xml:space="preserve">
<value>スナップショットの復元</value>
</data>
@ -10811,28 +10795,6 @@ StorageLink Gateway を使用する VM の XenServer 6.0 へのアップグレ
<data name="UPGRADE_SLAVE" xml:space="preserve">
<value>'{0}' のアップグレード</value>
</data>
<data name="UPGRADE_SR" xml:space="preserve">
<value>アップグレード...</value>
</data>
<data name="UPGRADE_SRS_PROMPT" xml:space="preserve">
<value>これらのストレージ リポジトリをアップグレードすると、XenServer 5.0 から使用できなくなります。
続行しますか?</value>
</data>
<data name="UPGRADE_SRS_PROMPT_TITLE" xml:space="preserve">
<value>複数ストレージ リポジトリのアップグレード</value>
</data>
<data name="UPGRADE_SR_PROMPT" xml:space="preserve">
<value>このストレージ リポジトリをアップグレードすると、XenServer 5.0 から使用できなくなります。
続行しますか?</value>
</data>
<data name="UPGRADE_SR_PROMPT_TITLE" xml:space="preserve">
<value>ストレージ リポジトリのアップグレード</value>
</data>
<data name="UPGRADE_SR_WARNING" xml:space="preserve">
<value>この SR はアップグレードが必要です</value>
</data>
<data name="UPGRADING" xml:space="preserve">
<value>アップグレードしています</value>
</data>

38
XenModel/Messages.resx
View File

@ -4722,12 +4722,6 @@ Would you like to eject these ISOs before continuing?</value>
<data name="ERROR_DIALOG_SUSPEND_VM_TITLE" xml:space="preserve">
<value>Error Suspending VM</value>
</data>
<data name="ERROR_DIALOG_UPGRADE_SR_TEXT" xml:space="preserve">
<value>The following storage repositories were not upgraded:</value>
</data>
<data name="ERROR_DIALOG_UPGRADE_SR_TITLE" xml:space="preserve">
<value>Error Upgrading Storage Repository</value>
</data>
<data name="ERROR_FILE_NOT_FOUND" xml:space="preserve">
<value>File {0} not found</value>
</data>
@ -7119,9 +7113,6 @@ This will permanently delete and reinitialize all local storage on the servers.
<data name="MAINWINDOW_TRIM_SR" xml:space="preserve">
<value>Re&amp;claim freed space</value>
</data>
<data name="MAINWINDOW_UPGRADE_SR" xml:space="preserve">
<value>&amp;Upgrade</value>
</data>
<data name="MAINWINDOW_XVA_BLURB" xml:space="preserve">
<value>XVA Files (*.xva)|*.xva|All Files (*.*)|*.*</value>
</data>
@ -9833,10 +9824,6 @@ The master must be upgraded first, so if you skip the master, the rolling pool u
<data name="ROLLING_UPGRADE_UPGRADE_NOT_COMPLETED" xml:space="preserve">
<value>Rolling pool upgrade did not complete.</value>
</data>
<data name="ROLLING_UPGRADE_WARNING_SL" xml:space="preserve">
<value>There are VMs using StorageLink Gateway.
Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if the VMs are shut down and using NetApp, Dell EqualLogic or SMI-S adapters.</value>
</data>
<data name="RPU_WARNING_DESCRIPTION_CLEARWATER_OR_GREATER" xml:space="preserve">
<value>'{0}': New versions of XenServer require new licenses to be added to your license server.</value>
</data>
@ -10282,9 +10269,6 @@ Do you want to connect to the pool master '{1}'?</value>
<data name="SNAPSHOT_OF_TITLE" xml:space="preserve">
<value>{0} (snapshot of '{1}' {2})</value>
</data>
<data name="SNAPSHOT_REQUIRE_GEORGE" xml:space="preserve">
<value>Snapshots require XenServer 5.5 or later</value>
</data>
<data name="SNAPSHOT_REVERT" xml:space="preserve">
<value>Snapshot revert</value>
</data>
@ -11376,28 +11360,6 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss
<data name="UPGRADE_SLAVE" xml:space="preserve">
<value>Upgrade '{0}'</value>
</data>
<data name="UPGRADE_SR" xml:space="preserve">
<value>Upgrade...</value>
</data>
<data name="UPGRADE_SRS_PROMPT" xml:space="preserve">
<value>If you upgrade these storage repositories, you will no longer be able to use them with XenServer 5.0.
Do you want to continue?</value>
</data>
<data name="UPGRADE_SRS_PROMPT_TITLE" xml:space="preserve">
<value>Upgrade Multiple Storage Repositories</value>
</data>
<data name="UPGRADE_SR_PROMPT" xml:space="preserve">
<value>If you upgrade this storage repository, you will no longer be able to use it with XenServer 5.0.
Do you want to continue?</value>
</data>
<data name="UPGRADE_SR_PROMPT_TITLE" xml:space="preserve">
<value>Upgrade Storage Repository</value>
</data>
<data name="UPGRADE_SR_WARNING" xml:space="preserve">
<value>This SR needs upgrading</value>
</data>
<data name="UPGRADING" xml:space="preserve">
<value>Upgrading</value>
</data>

38
XenModel/Messages.zh-CN.resx
View File

@ -4459,12 +4459,6 @@ XenServer 可以重新启动服务器并将服务器的 CPU 级别降至池中
<data name="ERROR_DIALOG_SUSPEND_VM_TITLE" xml:space="preserve">
<value>挂起 VM 时出错</value>
</data>
<data name="ERROR_DIALOG_UPGRADE_SR_TEXT" xml:space="preserve">
<value>未升级以下存储库:</value>
</data>
<data name="ERROR_DIALOG_UPGRADE_SR_TITLE" xml:space="preserve">
<value>升级存储库时出错</value>
</data>
<data name="ERROR_FILE_NOT_FOUND" xml:space="preserve">
<value>未找到文件 {0}</value>
</data>
@ -6784,9 +6778,6 @@ SCSI ID: {2}
<data name="MAINWINDOW_TRIM_SR" xml:space="preserve">
<value>回收释放的空间(&amp;C)</value>
</data>
<data name="MAINWINDOW_UPGRADE_SR" xml:space="preserve">
<value>升级(&amp;U)</value>
</data>
<data name="MAINWINDOW_XVA_BLURB" xml:space="preserve">
<value>XVA 文件(*.xva)|*.xva|所有文件(*.*)|*.*</value>
</data>
@ -9371,10 +9362,6 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别
<data name="ROLLING_UPGRADE_UPGRADE_NOT_COMPLETED" xml:space="preserve">
<value>池滚动升级未完成。</value>
</data>
<data name="ROLLING_UPGRADE_WARNING_SL" xml:space="preserve">
<value>存在使用 StorageLink Gateway 的 VM。
如果这些 VM 处于关闭状态，并且使用 NetApp、Dell EqualLogic 或 SMI-S 适配器，则仅支持使用 StorageLink Gateway 将 VM 升级到 XenServer 6.0。</value>
</data>
<data name="RPU_WARNING_DESCRIPTION_CLEARWATER_OR_GREATER" xml:space="preserve">
<value>{0}: 新版本的 XenServer 需要将新许可证添加到您的许可证服务器。</value>
</data>
@ -9808,9 +9795,6 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别
<data name="SNAPSHOT_OF" xml:space="preserve">
<value>快照属于</value>
</data>
<data name="SNAPSHOT_REQUIRE_GEORGE" xml:space="preserve">
<value>快照需要使用 XenServer 5.5 或更高版本</value>
</data>
<data name="SNAPSHOT_REVERT" xml:space="preserve">
<value>快照还原</value>
</data>
@ -10813,28 +10797,6 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别
<data name="UPGRADE_SLAVE" xml:space="preserve">
<value>升级“{0}”</value>
</data>
<data name="UPGRADE_SR" xml:space="preserve">
<value>升级...</value>
</data>
<data name="UPGRADE_SRS_PROMPT" xml:space="preserve">
<value>如果升级这些存储库，将无法再将其与 XenServer 5.0 结合使用。
是否继续?</value>
</data>
<data name="UPGRADE_SRS_PROMPT_TITLE" xml:space="preserve">
<value>升级多个存储库</value>
</data>
<data name="UPGRADE_SR_PROMPT" xml:space="preserve">
<value>如果升级该存储库，将无法再将其与 XenServer 5.0 结合使用。
是否继续?</value>
</data>
<data name="UPGRADE_SR_PROMPT_TITLE" xml:space="preserve">
<value>升级存储库</value>
</data>
<data name="UPGRADE_SR_WARNING" xml:space="preserve">
<value>该 SR 需要升级</value>
</data>
<data name="UPGRADING" xml:space="preserve">
<value>正在升级</value>
</data>

24
XenModel/XenAPI-Extensions/SR.cs
View File

@ -437,23 +437,6 @@ namespace XenAPI
}
}
public const String USE_VHD = "use_vhd";
public bool NeedsUpgrading
{
get
{
SRTypes type = GetSRType(false);
if (!(type == SRTypes.lvm ||
type == SRTypes.lvmofc ||
type == SRTypes.lvmohba ||
type == SRTypes.lvmoiscsi))
return false;
return !BoolKey(sm_config, USE_VHD);
}
}
/// <summary>
/// The SR is broken when it has the wrong number of PBDs, or (optionally) not all the PBDs are attached.
/// </summary>
@ -966,10 +949,6 @@ namespace XenAPI
{
return Icons.StorageBroken;
}
else if (NeedsUpgrading)
{
return Icons.StorageNeedsUpgrading;
}
else if (SR.IsDefaultSr(this))
{
return Icons.StorageDefault;
@ -1011,9 +990,6 @@ namespace XenAPI
if (!MultipathAOK)
return Messages.GENERAL_MULTIPATH_FAILURE;
if (NeedsUpgrading)
return Messages.UPGRADE_SR_WARNING;
return Messages.GENERAL_SR_STATE_OK;
}
}

3
XenModel/XenModel.csproj
View File

@ -62,7 +62,7 @@
<Compile Include="Actions\HealthCheck\HealthCheckAuthenticationAction.cs" />
<Compile Include="Actions\HealthCheck\SaveHealthCheckSettingsAction.cs" />
<Compile Include="Actions\HealthCheck\TransferHealthCheckSettingAction.cs" />
<Compile Include="Actions\HealthCheck\TransferProxySettingsAction.cs" />
<Compile Include="Actions\HealthCheck\TransferProxySettingsAction.cs" />
<Compile Include="Actions\HealthCheck\GetHealthCheckAnalysisResultAction.cs" />
<Compile Include="Actions\HealthCheck\UploadServerStatusReportAction.cs" />
<Compile Include="Actions\HealthCheck\XenServerHealthCheckUpload.cs" />
@ -263,7 +263,6 @@
<Compile Include="Actions\SR\SrRefreshAction.cs" />
<Compile Include="Actions\SR\SrRepairAction.cs" />
<Compile Include="Actions\SR\SrScanAction.cs" />
<Compile Include="Actions\SR\SrShareAction.cs" />
<Compile Include="Actions\StorageLink\SrCreateAction.cs" />
<Compile Include="Actions\StorageLink\SrCslgScanAction.cs" />
<Compile Include="Actions\StorageLink\SrCslgStoragePoolScanAction.cs" />