diff --git a/XenAdmin/Commands/Controls/ContextMenuBuilder.cs b/XenAdmin/Commands/Controls/ContextMenuBuilder.cs index 7a81c7fe9..cb08f1cc5 100644 --- a/XenAdmin/Commands/Controls/ContextMenuBuilder.cs +++ b/XenAdmin/Commands/Controls/ContextMenuBuilder.cs @@ -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(); diff --git a/XenAdmin/Commands/ShareSRCommand.cs b/XenAdmin/Commands/ShareSRCommand.cs deleted file mode 100644 index 56ccfcd81..000000000 --- a/XenAdmin/Commands/ShareSRCommand.cs +++ /dev/null @@ -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 -{ - /// - /// Shares the selected SR. - /// - internal class ShareSRCommand : Command - { - /// - /// 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. - /// - public ShareSRCommand() - { - } - - public ShareSRCommand(IMainWindow mainWindow, IEnumerable 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(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() && selection.AtLeastOneXenObjectCan(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; - } - } - } -} diff --git a/XenAdmin/Commands/UpgradeSRCommand.cs b/XenAdmin/Commands/UpgradeSRCommand.cs deleted file mode 100644 index 25fca2d1c..000000000 --- a/XenAdmin/Commands/UpgradeSRCommand.cs +++ /dev/null @@ -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 -{ - /// - /// Upgrades the selected SR. - /// - internal class UpgradeSRCommand : Command - { - /// - /// 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. - /// - public UpgradeSRCommand() - { - } - - public UpgradeSRCommand(IMainWindow mainWindow, IEnumerable selection) - : base(mainWindow, selection) - { - } - - public UpgradeSRCommand(IMainWindow mainWindow, SR selection) - : base(mainWindow, selection) - { - } - - public UpgradeSRCommand(IMainWindow mainWindow, IEnumerable selection) - : base(mainWindow, ConvertToSelection(selection)) - { - } - - protected override void ExecuteCore(SelectedItemCollection selection) - { - List actions = new List(); - foreach (SR sr in selection.AsXenObjects(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() && selection.AtLeastOneXenObjectCan(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 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); - } - } -} diff --git a/XenAdmin/Images.cs b/XenAdmin/Images.cs index ed9be0c9b..273084b2b 100644 --- a/XenAdmin/Images.cs +++ b/XenAdmin/Images.cs @@ -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); diff --git a/XenAdmin/Images/000_StorageNeedsUpgrading_h32bit_16.png b/XenAdmin/Images/000_StorageNeedsUpgrading_h32bit_16.png deleted file mode 100644 index 49de9d58a..000000000 Binary files a/XenAdmin/Images/000_StorageNeedsUpgrading_h32bit_16.png and /dev/null differ diff --git a/XenAdmin/MainWindow.Designer.cs b/XenAdmin/MainWindow.Designer.cs index 0518f22a9..7b3a08bb1 100644 --- a/XenAdmin/MainWindow.Designer.cs +++ b/XenAdmin/MainWindow.Designer.cs @@ -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; diff --git a/XenAdmin/MainWindow.resx b/XenAdmin/MainWindow.resx index 8bf94be22..45bd8354a 100644 --- a/XenAdmin/MainWindow.resx +++ b/XenAdmin/MainWindow.resx @@ -2100,13 +2100,13 @@ Remove Crash &Dump Files - 124, 22 + 161, 22 &Change... - 124, 22 + 161, 22 &Forget Password @@ -2303,18 +2303,6 @@ Set as Defaul&t - - 186, 22 - - - &Share - - - 186, 22 - - - &Upgrade - 183, 6 @@ -2369,6 +2357,9 @@ Destr&oy + + 186, 22 + 183, 6 @@ -3476,18 +3467,6 @@ XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - shareStorageRepositoryToolStripMenuItem - - - XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - upgradeStorageRepositoryToolStripMenuItem - - - XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - toolStripSeparator2 @@ -3548,6 +3527,12 @@ XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + ConvertToThinStorageRepositoryToolStripMenuItem + + + XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + toolStripSeparator18 @@ -3650,6 +3635,12 @@ XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + healthCheckToolStripMenuItem1 + + + XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + toolStripSeparator14 @@ -3794,12 +3785,6 @@ System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - healthCheckToolStripMenuItem1 - - - XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - MainWindow diff --git a/XenAdmin/Properties/Resources.Designer.cs b/XenAdmin/Properties/Resources.Designer.cs index 6073c0177..e739c5104 100644 --- a/XenAdmin/Properties/Resources.Designer.cs +++ b/XenAdmin/Properties/Resources.Designer.cs @@ -1090,16 +1090,6 @@ namespace XenAdmin.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap _000_StorageNeedsUpgrading_h32bit_16 { - get { - object obj = ResourceManager.GetObject("_000_StorageNeedsUpgrading_h32bit_16", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/XenAdmin/Properties/Resources.ja.resx b/XenAdmin/Properties/Resources.ja.resx index cae0e3fd6..0cd3923a5 100644 --- a/XenAdmin/Properties/Resources.ja.resx +++ b/XenAdmin/Properties/Resources.ja.resx @@ -733,9 +733,6 @@ ..\Images\000_StorageDisabled_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\000_StorageNeedsUpgrading_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\000_Storage_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/XenAdmin/Properties/Resources.resx b/XenAdmin/Properties/Resources.resx index fd0b91bf3..bb3ae17d0 100644 --- a/XenAdmin/Properties/Resources.resx +++ b/XenAdmin/Properties/Resources.resx @@ -328,9 +328,6 @@ ..\Images\001_Back_h32bit_24.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\000_StorageNeedsUpgrading_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\000_Fields_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/XenAdmin/Properties/Resources.zh-CN.resx b/XenAdmin/Properties/Resources.zh-CN.resx index 7fa974b4e..e837939f9 100644 --- a/XenAdmin/Properties/Resources.zh-CN.resx +++ b/XenAdmin/Properties/Resources.zh-CN.resx @@ -754,9 +754,6 @@ ..\Images\sl_add_storage_system_32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\000_StorageNeedsUpgrading_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Images\000_CPU_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/XenAdmin/TabPages/GeneralTabPage.cs b/XenAdmin/TabPages/GeneralTabPage.cs index cbf9819fb..9dace32d5 100644 --- a/XenAdmin/TabPages/GeneralTabPage.cs +++ b/XenAdmin/TabPages/GeneralTabPage.cs @@ -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 }; diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.Designer.cs b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.Designer.cs index a55780f79..60c1b7dd0 100644 --- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.Designer.cs +++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.Designer.cs @@ -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); diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.resx b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.resx index 4b8ce69c4..2055e80a8 100644 --- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.resx +++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardSelectPool.resx @@ -112,19 +112,19 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Top, Bottom, Left, Right - + True - + Qk32AgAAAAAAADYAAAAoAAAADgAAABAAAAABABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -145,14 +145,14 @@ - + 20 20 - + True @@ -164,7 +164,7 @@ 24 - + True @@ -173,7 +173,7 @@ 30 - + True @@ -182,7 +182,7 @@ 30 - + True @@ -192,10 +192,10 @@ 130 - 0, 53 + 0, 26 - 520, 292 + 520, 319 0 @@ -222,21 +222,19 @@ 0, 0 - 520, 50 + 520, 23 2 - 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. + Select the resource pools and/or standalone servers that you want to upgrade and then click Next. label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -266,7 +264,7 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5 buttonSelectAll - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -296,7 +294,7 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5 buttonClearAll - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -304,7 +302,7 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5 0 - + True @@ -314,31 +312,31 @@ Note: it is not possible to upgrade pools or servers running XenServer version 5 expansionColumn - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 checkBoxColumn - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NameColumn - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Description - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ColumnVersion - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 RollingUpgradeWizardSelectPool diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.Designer.cs b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.Designer.cs index 616b75203..76d35144d 100644 --- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.Designer.cs +++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.Designer.cs @@ -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; diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.resx b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.resx index 76f633228..bc8f86e67 100644 --- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.resx +++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_FirstPage.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + 3, 0 @@ -138,7 +138,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -155,7 +155,7 @@ True - + NoControl @@ -175,7 +175,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -183,36 +183,6 @@ 1 - - True - - - NoControl - - - 3, 82 - - - 588, 52 - - - 11 - - - 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. - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 2 - Top @@ -220,10 +190,10 @@ 0, 0 - 3 + 2 - 600, 164 + 600, 82 3 @@ -232,7 +202,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -241,7 +211,7 @@ 4 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label3" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Absolute,40,Absolute,42,Absolute,82,Absolute,20,Absolute,20" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="Absolute,40,Absolute,42,Absolute,20,Absolute,20" /></TableLayoutSettings> True @@ -250,7 +220,7 @@ Microsoft Sans Serif, 9pt, style=Bold - 56, 205 + 42, 123 194, 15 @@ -265,7 +235,7 @@ label6 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -277,7 +247,7 @@ Top, Left, Right - 56, 230 + 42, 148 3, 10, 3, 0 @@ -295,7 +265,7 @@ label7 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -304,7 +274,7 @@ 2 - 18, 205 + 4, 123 32, 32 @@ -319,7 +289,7 @@ pictureBox1 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -334,7 +304,7 @@ Microsoft Sans Serif, 8.25pt, style=Bold - 56, 292 + 42, 210 533, 34 @@ -352,7 +322,7 @@ labelRunningOnBattery - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -360,7 +330,7 @@ 0 - + True diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index 876dd4809..fe947d5bd 100644 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -241,7 +241,7 @@ ConvertToThinSRDialog.cs - + UserControl @@ -1531,7 +1531,7 @@ Designer AdPasswordPrompt.cs - + HealthCheckOverviewDialog.cs @@ -1568,7 +1568,7 @@ ConvertToThinSRDialog.cs - + SaveAndRestoreOptionsPage.cs @@ -3082,7 +3082,6 @@ - @@ -3103,7 +3102,6 @@ - diff --git a/XenAdmin/XenSearch/Columns.cs b/XenAdmin/XenSearch/Columns.cs index 8b0a1e035..c993236d0 100644 --- a/XenAdmin/XenSearch/Columns.cs +++ b/XenAdmin/XenSearch/Columns.cs @@ -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) { diff --git a/XenModel/Actions/SR/SrAction.cs b/XenModel/Actions/SR/SrAction.cs index 813f2e1f8..3303ef458 100644 --- a/XenModel/Actions/SR/SrAction.cs +++ b/XenModel/Actions/SR/SrAction.cs @@ -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); diff --git a/XenModel/Actions/SR/SrIntroduceAction.cs b/XenModel/Actions/SR/SrIntroduceAction.cs index 85646fd70..9a2e58d41 100644 --- a/XenModel/Actions/SR/SrIntroduceAction.cs +++ b/XenModel/Actions/SR/SrIntroduceAction.cs @@ -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; } diff --git a/XenModel/Actions/SR/SrShareAction.cs b/XenModel/Actions/SR/SrShareAction.cs deleted file mode 100644 index 9fef4ca6c..000000000 --- a/XenModel/Actions/SR/SrShareAction.cs +++ /dev/null @@ -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 -{ - /// - /// Turns an unshared SR into a shared SR. - /// - 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; - } - } - - /// - /// Destroys any PBDs on the SR and sets the SR to be unshared. - /// - /// No throw. - /// - 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); - } - } - } -} diff --git a/XenModel/Actions/StorageLink/SrCreateAction.cs b/XenModel/Actions/StorageLink/SrCreateAction.cs index e821df3f7..29937fb54 100644 --- a/XenModel/Actions/StorageLink/SrCreateAction.cs +++ b/XenModel/Actions/StorageLink/SrCreateAction.cs @@ -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; diff --git a/XenModel/Icons.cs b/XenModel/Icons.cs index 7b38c1705..192e88534 100644 --- a/XenModel/Icons.cs +++ b/XenModel/Icons.cs @@ -68,7 +68,6 @@ namespace XenAdmin StorageBroken, StorageDefault, StorageDisabled, - StorageNeedsUpgrading, PowerStateHalted, PowerStateSuspended, diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 271983e9a..e48329d65 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // 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 { } } - /// - /// Looks up a localized string similar to The following storage repositories were not upgraded:. - /// - public static string ERROR_DIALOG_UPGRADE_SR_TEXT { - get { - return ResourceManager.GetString("ERROR_DIALOG_UPGRADE_SR_TEXT", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Error Upgrading Storage Repository. - /// - public static string ERROR_DIALOG_UPGRADE_SR_TITLE { - get { - return ResourceManager.GetString("ERROR_DIALOG_UPGRADE_SR_TITLE", resourceCulture); - } - } - /// /// Looks up a localized string similar to File {0} not found. /// @@ -20450,15 +20432,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to &Upgrade. - /// - public static string MAINWINDOW_UPGRADE_SR { - get { - return ResourceManager.GetString("MAINWINDOW_UPGRADE_SR", resourceCulture); - } - } - /// /// Looks up a localized string similar to XVA Files (*.xva)|*.xva|All Files (*.*)|*.*. /// @@ -28216,16 +28189,6 @@ namespace XenAdmin { } } - /// - /// 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.. - /// - public static string ROLLING_UPGRADE_WARNING_SL { - get { - return ResourceManager.GetString("ROLLING_UPGRADE_WARNING_SL", resourceCulture); - } - } - /// /// 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.. /// @@ -29496,15 +29459,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to Snapshots require XenServer 5.5 or later. - /// - public static string SNAPSHOT_REQUIRE_GEORGE { - get { - return ResourceManager.GetString("SNAPSHOT_REQUIRE_GEORGE", resourceCulture); - } - } - /// /// Looks up a localized string similar to Snapshot revert. /// @@ -32747,64 +32701,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to Upgrade.... - /// - public static string UPGRADE_SR { - get { - return ResourceManager.GetString("UPGRADE_SR", resourceCulture); - } - } - - /// - /// 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?. - /// - public static string UPGRADE_SR_PROMPT { - get { - return ResourceManager.GetString("UPGRADE_SR_PROMPT", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Upgrade Storage Repository. - /// - public static string UPGRADE_SR_PROMPT_TITLE { - get { - return ResourceManager.GetString("UPGRADE_SR_PROMPT_TITLE", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to This SR needs upgrading. - /// - public static string UPGRADE_SR_WARNING { - get { - return ResourceManager.GetString("UPGRADE_SR_WARNING", resourceCulture); - } - } - - /// - /// 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?. - /// - public static string UPGRADE_SRS_PROMPT { - get { - return ResourceManager.GetString("UPGRADE_SRS_PROMPT", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Upgrade Multiple Storage Repositories. - /// - public static string UPGRADE_SRS_PROMPT_TITLE { - get { - return ResourceManager.GetString("UPGRADE_SRS_PROMPT_TITLE", resourceCulture); - } - } - /// /// Looks up a localized string similar to Apply Upgrade. /// diff --git a/XenModel/Messages.ja.resx b/XenModel/Messages.ja.resx index d33d206a3..1a6ad2401 100644 --- a/XenModel/Messages.ja.resx +++ b/XenModel/Messages.ja.resx @@ -4460,12 +4460,6 @@ CD をイジェクトしてから再試行してください。 VM の一時停止エラー - - 以下のストレージ リポジトリはアップグレードされていません。 - - - ストレージ リポジトリのアップグレード エラー - ファイル {0} が見つかりません @@ -6786,9 +6780,6 @@ SCSI ID: {2} 空き領域の解放(&C) - - アップグレード(&U) - XVA ファイル (*.xva)|*.xva|すべてのファイル (*.*)|*.* @@ -9369,10 +9360,6 @@ XenServer では、CPU の一部の機能をマスタに合わせて無効にす プールのローリング アップグレードが完了しませんでした。 - - StorageLink Gateway を使用している VM があります。 -StorageLink Gateway を使用する VM の XenServer 6.0 へのアップグレードは、VM がシャットダウン状態で NetApp、Dell EqualLogic、または SMI-S アダプタを使用する場合のみサポートされます。 - '{0}': 新しいバージョンの XenServer を使用するには、新しいライセンスをライセンス サーバーに追加する必要があります。 @@ -9806,9 +9793,6 @@ StorageLink Gateway を使用する VM の XenServer 6.0 へのアップグレ スナップショット作成元 - - スナップショットは、XenServer 5.5 以降でサポートされます - スナップショットの復元 @@ -10811,28 +10795,6 @@ StorageLink Gateway を使用する VM の XenServer 6.0 へのアップグレ '{0}' のアップグレード - - アップグレード... - - - これらのストレージ リポジトリをアップグレードすると、XenServer 5.0 から使用できなくなります。 - -続行しますか? - - - 複数ストレージ リポジトリのアップグレード - - - このストレージ リポジトリをアップグレードすると、XenServer 5.0 から使用できなくなります。 - -続行しますか? - - - ストレージ リポジトリのアップグレード - - - この SR はアップグレードが必要です - アップグレードしています diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index a487364c9..07878c07a 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -4722,12 +4722,6 @@ Would you like to eject these ISOs before continuing? Error Suspending VM - - The following storage repositories were not upgraded: - - - Error Upgrading Storage Repository - File {0} not found @@ -7119,9 +7113,6 @@ This will permanently delete and reinitialize all local storage on the servers. Re&claim freed space - - &Upgrade - XVA Files (*.xva)|*.xva|All Files (*.*)|*.* @@ -9833,10 +9824,6 @@ The master must be upgraded first, so if you skip the master, the rolling pool u Rolling pool upgrade did not complete. - - 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. - '{0}': New versions of XenServer require new licenses to be added to your license server. @@ -10282,9 +10269,6 @@ Do you want to connect to the pool master '{1}'? {0} (snapshot of '{1}' {2}) - - Snapshots require XenServer 5.5 or later - Snapshot revert @@ -11376,28 +11360,6 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss Upgrade '{0}' - - Upgrade... - - - If you upgrade these storage repositories, you will no longer be able to use them with XenServer 5.0. - -Do you want to continue? - - - Upgrade Multiple Storage Repositories - - - If you upgrade this storage repository, you will no longer be able to use it with XenServer 5.0. - -Do you want to continue? - - - Upgrade Storage Repository - - - This SR needs upgrading - Upgrading diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index d21164d4e..4696f84ee 100644 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -4459,12 +4459,6 @@ XenServer 可以重新启动服务器并将服务器的 CPU 级别降至池中 挂起 VM 时出错 - - 未升级以下存储库: - - - 升级存储库时出错 - 未找到文件 {0} @@ -6784,9 +6778,6 @@ SCSI ID: {2} 回收释放的空间(&C) - - 升级(&U) - XVA 文件(*.xva)|*.xva|所有文件(*.*)|*.* @@ -9371,10 +9362,6 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别 池滚动升级未完成。 - - 存在使用 StorageLink Gateway 的 VM。 -如果这些 VM 处于关闭状态，并且使用 NetApp、Dell EqualLogic 或 SMI-S 适配器，则仅支持使用 StorageLink Gateway 将 VM 升级到 XenServer 6.0。 - {0}: 新版本的 XenServer 需要将新许可证添加到您的许可证服务器。 @@ -9808,9 +9795,6 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别 快照属于 - - 快照需要使用 XenServer 5.5 或更高版本 - 快照还原 @@ -10813,28 +10797,6 @@ XenServer 可以重新启动服务器并将其 CPU 降至主服务器的级别 升级“{0}” - - 升级... - - - 如果升级这些存储库，将无法再将其与 XenServer 5.0 结合使用。 - -是否继续? - - - 升级多个存储库 - - - 如果升级该存储库，将无法再将其与 XenServer 5.0 结合使用。 - -是否继续? - - - 升级存储库 - - - 该 SR 需要升级 - 正在升级 diff --git a/XenModel/XenAPI-Extensions/SR.cs b/XenModel/XenAPI-Extensions/SR.cs index 8723cdfaf..51b77dd30 100644 --- a/XenModel/XenAPI-Extensions/SR.cs +++ b/XenModel/XenAPI-Extensions/SR.cs @@ -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); - } - } - /// /// The SR is broken when it has the wrong number of PBDs, or (optionally) not all the PBDs are attached. /// @@ -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; } } diff --git a/XenModel/XenModel.csproj b/XenModel/XenModel.csproj index 979a8a2cf..2370cf875 100644 --- a/XenModel/XenModel.csproj +++ b/XenModel/XenModel.csproj @@ -62,7 +62,7 @@ - + @@ -263,7 +263,6 @@ -