Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-29 23:30:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1119 from mcintyre94/CA-217821

Browse Source 
CA-217821: Specified home server in cross pool migration should behave as home server
This commit is contained in:
Mihaela Stoica 2016-08-15 19:38:00 +01:00 committed by GitHub
commit 8bdcbc5208
14 changed files with 158 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs
View File

@ -38,7 +38,7 @@ using XenAPI;
namespace XenAdmin.Commands namespace XenAdmin.Commands
{ {
/// <summary> /// <summary>
/// The command for the 'Home Server' subitem which is shown when WLB isn't enabled in the submenu for start-on, resume-on or migrate. /// The command for the 'Target Server' subitem which is shown when WLB isn't enabled in the submenu for start-on, resume-on or migrate.
/// </summary> /// </summary>
internal class CrossPoolMigrateToHomeCommand : CrossPoolMigrateCommand internal class CrossPoolMigrateToHomeCommand : CrossPoolMigrateCommand
{ {

14
XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs
View File

@ -112,9 +112,9 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
} }
} }
protected override string HomeServerText { get { return Messages.CPM_WIZARD_DESTINATION_DESTINATION; } } protected override string TargetServerText { get { return Messages.CPM_WIZARD_DESTINATION_DESTINATION; } }
protected override string HomeServerSelectionIntroText { get { return Messages.CPM_WIZARD_DESTINATION_TABLE_INTRO; } } protected override string TargetServerSelectionIntroText { get { return Messages.CPM_WIZARD_DESTINATION_TABLE_INTRO; } }
public override DelayLoadingOptionComboBoxItem CreateDelayLoadingOptionComboBoxItem(IXenObject xenItem) public override DelayLoadingOptionComboBoxItem CreateDelayLoadingOptionComboBoxItem(IXenObject xenItem)
@ -122,7 +122,7 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
return new CrossPoolMigrateDelayLoadingComboBoxItem(xenItem, preSelectedHost, selectedVMs); return new CrossPoolMigrateDelayLoadingComboBoxItem(xenItem, preSelectedHost, selectedVMs);
} }
protected override List<ReasoningFilter> CreateHomeServerFilterList(IEnableableXenObjectComboBoxItem selectedItem) protected override List<ReasoningFilter> CreateTargetServerFilterList(IEnableableXenObjectComboBoxItem selectedItem)
{ {
List<ReasoningFilter> filters = new List<ReasoningFilter>{ new ResidentHostIsSameAsSelectionFilter(selectedVMs) }; List<ReasoningFilter> filters = new List<ReasoningFilter>{ new ResidentHostIsSameAsSelectionFilter(selectedVMs) };
@ -168,5 +168,13 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
return TemplatesOnly ? Messages.TEMPLATE : Messages.VM; return TemplatesOnly ? Messages.TEMPLATE : Messages.VM;
} }
} }
protected override string TargetColumnHeaderText
{
get
{
return Messages.TARGET_SERVER;
}
}
} }
} }

6
XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.Designer.cs generated
View File

@ -67,10 +67,10 @@
resources.ApplyResources(this.networkComboBox, "networkComboBox"); resources.ApplyResources(this.networkComboBox, "networkComboBox");
this.networkComboBox.Name = "networkComboBox"; this.networkComboBox.Name = "networkComboBox";
// //
// label3 // blurbText
// //
resources.ApplyResources(this.blurbText, "label3"); resources.ApplyResources(this.blurbText, "blurbText");
this.blurbText.Name = "label3"; this.blurbText.Name = "blurbText";
// //
// CrossPoolMigrateTransferNetworkPage // CrossPoolMigrateTransferNetworkPage
// //

49
XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.resx
View File

@ -145,7 +145,7 @@
<value>0, 0, 10, 0</value> <value>0, 0, 10, 0</value>
</data> </data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing"> <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 27</value> <value>229, 46</value>
</data> </data>
<data name="label1.TabIndex" type="System.Int32, mscorlib"> <data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -172,10 +172,10 @@
<value>False</value> <value>False</value>
</data> </data>
<data name="networkComboBox.Location" type="System.Drawing.Point, System.Drawing"> <data name="networkComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>101, 3</value> <value>242, 3</value>
</data> </data>
<data name="networkComboBox.Size" type="System.Drawing.Size, System.Drawing"> <data name="networkComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>432, 21</value> <value>432, 39</value>
</data> </data>
<data name="networkComboBox.TabIndex" type="System.Int32, mscorlib"> <data name="networkComboBox.TabIndex" type="System.Int32, mscorlib">
<value>11</value> <value>11</value>
@ -196,13 +196,13 @@
<value>Top</value> <value>Top</value>
</data> </data>
<data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing"> <data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 36</value> <value>3, 55</value>
</data> </data>
<data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib"> <data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
</data> </data>
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing"> <data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
<value>608, 27</value> <value>1529, 46</value>
</data> </data>
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib"> <data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
<value>2</value> <value>2</value>
@ -222,40 +222,40 @@
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <data name="tableLayoutPanel2.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="networkComboBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,100" /&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="networkComboBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<data name="label3.AutoSize" type="System.Boolean, mscorlib"> <data name="blurbText.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </data>
<data name="label3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="blurbText.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <data name="blurbText.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value> <value>NoControl</value>
</data> </data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing"> <data name="blurbText.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value> <value>3, 0</value>
</data> </data>
<data name="label3.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms"> <data name="blurbText.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 20</value> <value>0, 0, 0, 20</value>
</data> </data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing"> <data name="blurbText.Size" type="System.Drawing.Size, System.Drawing">
<value>608, 33</value> <value>1529, 52</value>
</data> </data>
<data name="label3.TabIndex" type="System.Int32, mscorlib"> <data name="blurbText.TabIndex" type="System.Int32, mscorlib">
<value>14</value> <value>14</value>
</data> </data>
<data name="label3.Text" xml:space="preserve"> <data name="blurbText.Text" xml:space="preserve">
<value>label3</value> <value>label3</value>
</data> </data>
<data name="&gt;&gt;label3.Name" xml:space="preserve"> <data name="&gt;&gt;blurbText.Name" xml:space="preserve">
<value>label3</value> <value>blurbText</value>
</data> </data>
<data name="&gt;&gt;label3.Type" xml:space="preserve"> <data name="&gt;&gt;blurbText.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.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>
<data name="&gt;&gt;label3.Parent" xml:space="preserve"> <data name="&gt;&gt;blurbText.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value> <value>tableLayoutPanel1</value>
</data> </data>
<data name="&gt;&gt;label3.ZOrder" xml:space="preserve"> <data name="&gt;&gt;blurbText.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>
</data> </data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -268,7 +268,7 @@
<value>2</value> <value>2</value>
</data> </data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing"> <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>614, 332</value> <value>1535, 830</value>
</data> </data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib"> <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@ -286,16 +286,19 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <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="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value> <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="blurbText" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.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> <value>True</value>
</metadata> </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value> <value>240, 240</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 8, 8, 8</value>
</data> </data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing"> <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>614, 332</value> <value>1535, 830</value>
</data> </data>
<data name="$this.Text" xml:space="preserve"> <data name="$this.Text" xml:space="preserve">
<value>CrossPoolMigrateTransferNetworkPage</value> <value>CrossPoolMigrateTransferNetworkPage</value>

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

@ -419,7 +419,7 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
summary = new VmTitleSummary(summary, pair.Value); summary = new VmTitleSummary(summary, pair.Value);
summary = new DestinationPoolSummary(summary, pair.Value, TargetConnection); summary = new DestinationPoolSummary(summary, pair.Value, TargetConnection);
summary = new HomeServerSummary(summary, pair.Value, TargetConnection); summary = new TargetServerSummary(summary, pair.Value, TargetConnection);
summary = new TransferNetworkSummary(summary, m_pageTransferNetwork.NetworkUuid.Value); summary = new TransferNetworkSummary(summary, m_pageTransferNetwork.NetworkUuid.Value);
summary = new StorageSummary(summary, pair.Value, xenConnection); summary = new StorageSummary(summary, pair.Value, xenConnection);
summary = new NetworkSummary(summary, pair.Value, xenConnection); summary = new NetworkSummary(summary, pair.Value, xenConnection);

24
XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.cs
View File

@ -101,9 +101,10 @@ namespace XenAdmin.Wizards.GenericPages
protected void InitializeText() protected void InitializeText()
{ {
m_labelIntro.Text = InstructionText; m_labelIntro.Text = InstructionText;
label1.Text = HomeServerText; label1.Text = TargetServerText;
label2.Text = HomeServerSelectionIntroText; label2.Text = TargetServerSelectionIntroText;
m_colVmName.HeaderText = VmColumnHeaderText; m_colVmName.HeaderText = VmColumnHeaderText;
m_colTarget.HeaderText = TargetColumnHeaderText;
} }
private IXenObject _chosenItem; private IXenObject _chosenItem;
@ -123,9 +124,9 @@ namespace XenAdmin.Wizards.GenericPages
protected abstract string InstructionText { get; } protected abstract string InstructionText { get; }
/// <summary> /// <summary>
/// Text demarking what the label fot the home server drop down should be /// Text demarking what the label for the target server drop down should be
/// </summary> /// </summary>
protected abstract string HomeServerText { get; } protected abstract string TargetServerText { get; }
protected virtual string VmColumnHeaderText protected virtual string VmColumnHeaderText
{ {
@ -135,10 +136,19 @@ namespace XenAdmin.Wizards.GenericPages
} }
} }
protected virtual string TargetColumnHeaderText
{
get
{
return m_colTarget.HeaderText;
}
}
/// <summary> /// <summary>
/// Text above the table containing a list of VMs and concomitant home server /// Text above the table containing a list of VMs and concomitant home server
/// </summary> /// </summary>
protected abstract string HomeServerSelectionIntroText { get; } protected abstract string TargetServerSelectionIntroText { get; }
protected virtual void OnChosenItemChanged() protected virtual void OnChosenItemChanged()
{} {}
@ -553,7 +563,7 @@ namespace XenAdmin.Wizards.GenericPages
{ {
Cursor.Current = Cursors.WaitCursor; Cursor.Current = Cursors.WaitCursor;
ChosenItem = item == null ? null : item.Item; ChosenItem = item == null ? null : item.Item;
Program.Invoke(Program.MainWindow, ()=> PopulateDataGridView(CreateHomeServerFilterList(item))); Program.Invoke(Program.MainWindow, ()=> PopulateDataGridView(CreateTargetServerFilterList(item)));
} }
finally finally
{ {
@ -569,7 +579,7 @@ namespace XenAdmin.Wizards.GenericPages
/// </summary> /// </summary>
/// <param name="item">selected item from the host combobox</param> /// <param name="item">selected item from the host combobox</param>
/// <returns></returns> /// <returns></returns>
protected virtual List<ReasoningFilter> CreateHomeServerFilterList(IEnableableXenObjectComboBoxItem item) protected virtual List<ReasoningFilter> CreateTargetServerFilterList(IEnableableXenObjectComboBoxItem item)
{ {
return new List<ReasoningFilter>(); return new List<ReasoningFilter>();
} }

22
XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.resx
View File

@ -112,26 +112,26 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <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>
<resheader name="writer"> <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> </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="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib"> <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
</data> </data>
<data name="m_labelIntro.AutoSize" type="System.Boolean, mscorlib"> <data name="m_labelIntro.AutoSize" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</data> </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="m_labelIntro.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="m_labelIntro.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="m_labelIntro.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> <data name="m_labelIntro.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value> <value>NoControl</value>
</data> </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="m_labelIntro.Location" type="System.Drawing.Point, System.Drawing"> <data name="m_labelIntro.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 0</value> <value>3, 0</value>
</data> </data>
@ -285,18 +285,18 @@
<data name="&gt;&gt;label2.ZOrder" xml:space="preserve"> <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
<value>2</value> <value>2</value>
</data> </data>
<metadata name="m_colVmName.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="m_colVmName.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<data name="m_colVmName.HeaderText" xml:space="preserve"> <data name="m_colVmName.HeaderText" xml:space="preserve">
<value>VM</value> <value>VM</value>
</data> </data>
<data name="m_colVmName.Width" type="System.Int32, mscorlib"> <data name="m_colVmName.Width" type="System.Int32, mscorlib">
<value>48</value> <value>48</value>
</data> </data>
<metadata name="m_colTarget.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="m_colTarget.UserAddedColumn" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<data name="m_colTarget.HeaderText" xml:space="preserve"> <data name="m_colTarget.HeaderText" xml:space="preserve">
<value>Home Server</value> <value>Home Server</value>
</data> </data>
@ -447,9 +447,9 @@
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms"> <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="m_labelIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_dataGridView" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanelWarning" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,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="m_labelIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="m_dataGridView" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanelWarning" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data> </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <data name="$this.Localizable" type="System.Boolean, mscorlib">
<value>True</value> <value>True</value>
</metadata> </data>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value> <value>96, 96</value>
</data> </data>

6
XenAdmin/Wizards/GenericPages/VMMappingSummary.cs
View File

@ -168,12 +168,12 @@ namespace XenAdmin.Wizards.GenericPages
} }
} }
public class HomeServerSummary : MappingSummaryDecorator public class TargetServerSummary : MappingSummaryDecorator
{ {
private readonly VmMapping mapping; private readonly VmMapping mapping;
private readonly IXenConnection connection; private readonly IXenConnection connection;
public HomeServerSummary(MappingSummary summary, VmMapping mapping, IXenConnection connection) public TargetServerSummary(MappingSummary summary, VmMapping mapping, IXenConnection connection)
: base(summary) : base(summary)
{ {
this.mapping = mapping; this.mapping = mapping;
@ -185,7 +185,7 @@ namespace XenAdmin.Wizards.GenericPages
get get
{ {
List<SummaryDetails> decoratedSummary = summary.Details; List<SummaryDetails> decoratedSummary = summary.Details;
decoratedSummary.Add(new SummaryDetails(Messages.CPM_SUMMARY_KEY_HOME_SERVER, ResolveLabel())); decoratedSummary.Add(new SummaryDetails(Messages.CPM_SUMMARY_KEY_TARGET_SERVER, ResolveLabel()));
return decoratedSummary; return decoratedSummary;
} }
} }

4
XenAdmin/Wizards/ImportWizard/ImportSelectHostPage.cs
View File

@ -84,9 +84,9 @@ namespace XenAdmin.Wizards.ImportWizard
protected override string InstructionText { get { return Messages.IMPORT_WIZARD_DESTINATION_INSTRUCTIONS; } } protected override string InstructionText { get { return Messages.IMPORT_WIZARD_DESTINATION_INSTRUCTIONS; } }
protected override string HomeServerText { get { return Messages.IMPORT_WIZARD_DESTINATION_DESTINATION; } } protected override string TargetServerText { get { return Messages.IMPORT_WIZARD_DESTINATION_DESTINATION; } }
protected override string HomeServerSelectionIntroText { get { return Messages.IMPORT_WIZARD_DESTINATION_TABLE_INTRO; } } protected override string TargetServerSelectionIntroText { get { return Messages.IMPORT_WIZARD_DESTINATION_TABLE_INTRO; } }
protected override void OnChosenItemChanged() protected override void OnChosenItemChanged()
{ {

29
XenModel/Messages.Designer.cs generated
View File

@ -8571,15 +8571,6 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to Home Server:.
/// </summary>
public static string CPM_SUMMARY_KEY_HOME_SERVER {
get {
return ResourceManager.GetString("CPM_SUMMARY_KEY_HOME_SERVER", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Template:. /// Looks up a localized string similar to Template:.
/// </summary> /// </summary>
@ -8616,6 +8607,15 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to Target Server:.
/// </summary>
public static string CPM_SUMMARY_KEY_TARGET_SERVER {
get {
return ResourceManager.GetString("CPM_SUMMARY_KEY_TARGET_SERVER", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Migration Network:. /// Looks up a localized string similar to Migration Network:.
/// </summary> /// </summary>
@ -8743,7 +8743,7 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Specify a &amp;home server in the destination pool (optional):. /// Looks up a localized string similar to Specify a &amp;target server in the destination pool (optional):.
/// </summary> /// </summary>
public static string CPM_WIZARD_DESTINATION_TABLE_INTRO { public static string CPM_WIZARD_DESTINATION_TABLE_INTRO {
get { get {
@ -31263,6 +31263,15 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to Target Server.
/// </summary>
public static string TARGET_SERVER {
get {
return ResourceManager.GetString("TARGET_SERVER", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Tell me more .... /// Looks up a localized string similar to Tell me more ....
/// </summary> /// </summary>

26
XenModel/Messages.ja.resx
View File

@ -59,17 +59,17 @@
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element msdata:IsDataSet="true" name="root"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata"> <xsd:element name="metadata">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element minOccurs="0" name="value" type="xsd:string"/> <xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
@ -84,19 +84,19 @@
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element minOccurs="0" msdata:Ordinal="1" name="value" type="xsd:string"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element minOccurs="0" msdata:Ordinal="2" name="comment" type="xsd:string"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute msdata:Ordinal="1" name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute msdata:Ordinal="3" name="type" type="xsd:string"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute msdata:Ordinal="4" name="mimetype" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element minOccurs="0" msdata:Ordinal="1" name="value" type="xsd:string"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" /> <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType> </xsd:complexType>
@ -12948,4 +12948,10 @@ To learn more about the [XenServer] Active Directory feature or to start a [XenS
<data name="YOU_ARE_HERE" xml:space="preserve"> <data name="YOU_ARE_HERE" xml:space="preserve">
<value>現在の位置</value> <value>現在の位置</value>
</data> </data>
<data name="TARGET_SERVER" xml:space="preserve">
<value>Target Server</value>
</data>
<data name="CPM_SUMMARY_KEY_TARGET_SERVER" xml:space="preserve">
<value>Target Server:</value>
</data>
</root> </root>

11
XenModel/Messages.resx
View File

@ -3110,9 +3110,6 @@ You can only connect to a single [Citrix] [XenServer product] Express Edition se
<data name="CPM_SUMMARY_KEY_DESTINATION" xml:space="preserve"> <data name="CPM_SUMMARY_KEY_DESTINATION" xml:space="preserve">
<value>Destination:</value> <value>Destination:</value>
</data> </data>
<data name="CPM_SUMMARY_KEY_HOME_SERVER" xml:space="preserve">
<value>Home Server:</value>
</data>
<data name="CPM_SUMMARY_KEY_MIGRATE_TEMPLATE" xml:space="preserve"> <data name="CPM_SUMMARY_KEY_MIGRATE_TEMPLATE" xml:space="preserve">
<value>Template:</value> <value>Template:</value>
</data> </data>
@ -3125,6 +3122,9 @@ You can only connect to a single [Citrix] [XenServer product] Express Edition se
<data name="CPM_SUMMARY_KEY_STORAGE" xml:space="preserve"> <data name="CPM_SUMMARY_KEY_STORAGE" xml:space="preserve">
<value>Storage:</value> <value>Storage:</value>
</data> </data>
<data name="CPM_SUMMARY_KEY_TARGET_SERVER" xml:space="preserve">
<value>Target Server:</value>
</data>
<data name="CPM_SUMMARY_KEY_TRANSFER_NETWORK" xml:space="preserve"> <data name="CPM_SUMMARY_KEY_TRANSFER_NETWORK" xml:space="preserve">
<value>Migration Network:</value> <value>Migration Network:</value>
</data> </data>
@ -3165,7 +3165,7 @@ You can only connect to a single [Citrix] [XenServer product] Express Edition se
<value>Select the pool or standalone server where you want to migrate the selected VM to.</value> <value>Select the pool or standalone server where you want to migrate the selected VM to.</value>
</data> </data>
<data name="CPM_WIZARD_DESTINATION_TABLE_INTRO" xml:space="preserve"> <data name="CPM_WIZARD_DESTINATION_TABLE_INTRO" xml:space="preserve">
<value>Specify a &amp;home server in the destination pool (optional):</value> <value>Specify a &amp;target server in the destination pool (optional):</value>
</data> </data>
<data name="CPM_WIZARD_DESTINATION_TAB_TITLE" xml:space="preserve"> <data name="CPM_WIZARD_DESTINATION_TAB_TITLE" xml:space="preserve">
<value>Destination Pool</value> <value>Destination Pool</value>
@ -10861,6 +10861,9 @@ Refer to the "[XenServer product] Administrator's Guide" for instructions on how
<data name="TARGET" xml:space="preserve"> <data name="TARGET" xml:space="preserve">
<value>Target</value> <value>Target</value>
</data> </data>
<data name="TARGET_SERVER" xml:space="preserve">
<value>Target Server</value>
</data>
<data name="TELL_ME_MORE" xml:space="preserve"> <data name="TELL_ME_MORE" xml:space="preserve">
<value>Tell me more ...</value> <value>Tell me more ...</value>
</data> </data>

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

@ -59,17 +59,17 @@
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element msdata:IsDataSet="true" name="root"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata"> <xsd:element name="metadata">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element minOccurs="0" name="value" type="xsd:string"/> <xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
@ -84,19 +84,19 @@
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element minOccurs="0" msdata:Ordinal="1" name="value" type="xsd:string"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element minOccurs="0" msdata:Ordinal="2" name="comment" type="xsd:string"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute msdata:Ordinal="1" name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute msdata:Ordinal="3" name="type" type="xsd:string"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute msdata:Ordinal="4" name="mimetype" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" /> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element minOccurs="0" msdata:Ordinal="1" name="value" type="xsd:string"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" /> <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType> </xsd:complexType>
@ -12947,4 +12947,10 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并
<data name="YOU_ARE_HERE" xml:space="preserve"> <data name="YOU_ARE_HERE" xml:space="preserve">
<value>您在此处</value> <value>您在此处</value>
</data> </data>
<data name="TARGET_SERVER" xml:space="preserve">
<value>Target Server</value>
</data>
<data name="CPM_SUMMARY_KEY_TARGET_SERVER" xml:space="preserve">
<value>Target Server:</value>
</data>
</root> </root>