mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2025-01-20 07:19:18 +01:00
CP-12314: FCoE in the SR wizard
- show new NIC column on the Location page (visible for FCoE only) - display the summary page - resource strings for default SR name and the blurb on the first page in the wizard Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica
parent
3402ca03d8
commit
f026384f37
@ -228,7 +228,9 @@ namespace XenAdmin.Wizards
|
||||
|
||||
m_srWizardType.SrDescriptors.Add(lvmOhbaSrDescriptor);
|
||||
names.Add(name);
|
||||
name = SrWizardHelpers.DefaultSRName(Messages.NEWSR_HBA_DEFAULT_NAME, names);
|
||||
name = SrWizardHelpers.DefaultSRName(m_srWizardType is SrWizardType_LvmoHba
|
||||
? Messages.NEWSR_HBA_DEFAULT_NAME
|
||||
: Messages.NEWSR_FCOE_DEFAULT_NAME, names);
|
||||
}
|
||||
|
||||
xenTabPageLvmoHbaSummary.SuccessfullyCreatedSRs.Clear();
|
||||
@ -550,7 +552,7 @@ namespace XenAdmin.Wizards
|
||||
|
||||
protected override void FinishWizard()
|
||||
{
|
||||
if (m_srWizardType is SrWizardType_LvmoHba)
|
||||
if (m_srWizardType is SrWizardType_LvmoHba || m_srWizardType is SrWizardType_Fcoe)
|
||||
{
|
||||
base.FinishWizard();
|
||||
return;
|
||||
@ -628,7 +630,7 @@ namespace XenAdmin.Wizards
|
||||
ProgressBarStyle progressBarStyle = FinalAction is SrIntroduceAction ? ProgressBarStyle.Blocks : ProgressBarStyle.Marquee;
|
||||
ActionProgressDialog dialog = new ActionProgressDialog(FinalAction, progressBarStyle) {ShowCancel = true};
|
||||
|
||||
if (m_srWizardType is SrWizardType_LvmoHba)
|
||||
if (m_srWizardType is SrWizardType_LvmoHba || m_srWizardType is SrWizardType_Fcoe)
|
||||
{
|
||||
ActionProgressDialog closureDialog = dialog;
|
||||
// close dialog even when there's an error for HBA SR type as there will be the Summary page displayed.
|
||||
@ -641,7 +643,7 @@ namespace XenAdmin.Wizards
|
||||
}
|
||||
dialog.ShowDialog(this);
|
||||
|
||||
if (m_srWizardType is SrWizardType_LvmoHba)
|
||||
if (m_srWizardType is SrWizardType_LvmoHba || m_srWizardType is SrWizardType_Fcoe)
|
||||
{
|
||||
foreach (var asyncAction in actionList)
|
||||
{
|
||||
|
||||
@ -211,7 +211,7 @@
|
||||
<value>67, 19</value>
|
||||
</data>
|
||||
<data name="radioButtonNfsIso.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>17</value>
|
||||
<value>18</value>
|
||||
</data>
|
||||
<data name="radioButtonNfsIso.Text" xml:space="preserve">
|
||||
<value>NFS &ISO</value>
|
||||
@ -247,7 +247,7 @@
|
||||
<value>172, 19</value>
|
||||
</data>
|
||||
<data name="radioButtonCifsIso.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>16</value>
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="radioButtonCifsIso.Text" xml:space="preserve">
|
||||
<value>Windows File Sharing (&CIFS)</value>
|
||||
@ -319,7 +319,7 @@
|
||||
<value>150, 19</value>
|
||||
</data>
|
||||
<data name="radioButtonCslg.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>15</value>
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="radioButtonCslg.Text" xml:space="preserve">
|
||||
<value>S&torageLink technology</value>
|
||||
@ -615,13 +615,13 @@
|
||||
<value>6, 3, 3, 3</value>
|
||||
</data>
|
||||
<data name="radioButtonFcoe.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>52, 19</value>
|
||||
<value>101, 19</value>
|
||||
</data>
|
||||
<data name="radioButtonFcoe.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>18</value>
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="radioButtonFcoe.Text" xml:space="preserve">
|
||||
<value>&FCoE</value>
|
||||
<value>Software FCo&E</value>
|
||||
</data>
|
||||
<data name=">>radioButtonFcoe.Name" xml:space="preserve">
|
||||
<value>radioButtonFcoe</value>
|
||||
|
||||
@ -51,6 +51,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
public readonly String name_label;
|
||||
public readonly String name_description;
|
||||
public readonly bool pool_metadata_detected;
|
||||
public readonly String eth;
|
||||
|
||||
public FibreChannelDevice(String serial, String path,
|
||||
String vendor, long size, String SCSIid, String adapter,
|
||||
@ -73,7 +74,8 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
public FibreChannelDevice(String serial, String path,
|
||||
String vendor, long size, String SCSIid, String adapter,
|
||||
String channel, String id, String lun,
|
||||
String name_label, String name_description, bool pool_metadata_detected)
|
||||
String name_label, String name_description, bool pool_metadata_detected,
|
||||
String eth)
|
||||
{
|
||||
this.Serial = serial;
|
||||
this.Path = path;
|
||||
@ -87,6 +89,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
this.name_label = name_label;
|
||||
this.name_description = name_description;
|
||||
this.pool_metadata_detected = pool_metadata_detected;
|
||||
this.eth = eth;
|
||||
}
|
||||
|
||||
public int CompareTo(FibreChannelDevice other)
|
||||
|
||||
@ -63,6 +63,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
string name_label = "";
|
||||
string name_description = "";
|
||||
bool pool_metadata_detected = false;
|
||||
string eth = "";
|
||||
|
||||
foreach (XmlNode node in device.ChildNodes)
|
||||
{
|
||||
@ -90,10 +91,12 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
name_description = node.InnerText.Trim();
|
||||
if (node.Name.ToLowerInvariant() == "pool_metadata_detected")
|
||||
pool_metadata_detected = bool.Parse(node.InnerText.Trim());
|
||||
if (node.Name.ToLowerInvariant() == "eth")
|
||||
eth = node.InnerText.Trim();
|
||||
}
|
||||
|
||||
devices.Add(new FibreChannelDevice(serial, path, vendor, size,
|
||||
scsiid, adapter, channel, id, lun, name_label, name_description, pool_metadata_detected));
|
||||
scsiid, adapter, channel, id, lun, name_label, name_description, pool_metadata_detected, eth));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@ -13,6 +13,13 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
|
||||
public override SR.SRTypes SrType { get { return SR.SRTypes.lvmofcoe; } }
|
||||
|
||||
public override bool ShowNicColumn { get { return true; } }
|
||||
|
||||
public override LvmOhbaSrDescriptor CreateSrDescriptor(FibreChannelDevice device)
|
||||
{
|
||||
return new FcoeSrDescriptor(device);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -58,6 +58,13 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
|
||||
public virtual SR.SRTypes SrType { get { return SR.SRTypes.lvmohba; } }
|
||||
|
||||
public virtual bool ShowNicColumn { get { return false; } }
|
||||
|
||||
public virtual LvmOhbaSrDescriptor CreateSrDescriptor(FibreChannelDevice device)
|
||||
{
|
||||
return new LvmOhbaSrDescriptor(device, Connection);
|
||||
}
|
||||
|
||||
#region XenTabPage overrides
|
||||
|
||||
public override string PageTitle { get { return Messages.NEWSR_SELECT_LUN; } }
|
||||
@ -85,12 +92,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
|
||||
foreach (var device in _selectedDevices)
|
||||
{
|
||||
LvmOhbaSrDescriptor descr;
|
||||
|
||||
if (this is LVMoFCoE)
|
||||
descr = new LvmOhbaSrDescriptor(device, Connection);
|
||||
else
|
||||
descr = new FcoeSrDescriptor(device);
|
||||
LvmOhbaSrDescriptor descr = CreateSrDescriptor(device);
|
||||
|
||||
var action = new SrProbeAction(Connection, master, SrType, descr.DeviceConfig);
|
||||
new ActionProgressDialog(action, ProgressBarStyle.Marquee).ShowDialog(this);
|
||||
@ -195,6 +197,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
|
||||
public override void PopulatePage()
|
||||
{
|
||||
colNic.Visible = ShowNicColumn;
|
||||
dataGridView.Rows.Clear();
|
||||
|
||||
var vendorGroups = from device in FCDevices
|
||||
@ -215,7 +218,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
SelectionForeColor = dataGridView.DefaultCellStyle.ForeColor
|
||||
};
|
||||
|
||||
var deviceRows = from device in vGroup.Devices select new FCDeviceRow(device);
|
||||
var deviceRows = from device in vGroup.Devices select new FCDeviceRow(device, ShowNicColumn);
|
||||
dataGridView.Rows.AddRange(deviceRows.ToArray());
|
||||
}
|
||||
}
|
||||
@ -389,7 +392,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
{
|
||||
public FibreChannelDevice Device { get; private set; }
|
||||
|
||||
public FCDeviceRow(FibreChannelDevice device)
|
||||
public FCDeviceRow(FibreChannelDevice device, bool showNicColumn)
|
||||
{
|
||||
Device = device;
|
||||
|
||||
@ -401,6 +404,9 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
new DataGridViewTextBoxCell { Value = device.Serial },
|
||||
new DataGridViewTextBoxCell { Value = id },
|
||||
new DataGridViewTextBoxCell { Value = details });
|
||||
|
||||
if (showNicColumn)
|
||||
Cells.Add(new DataGridViewTextBoxCell {Value = device.eth});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -31,15 +31,16 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LVMoHBA));
|
||||
this.labelReattach = new System.Windows.Forms.Label();
|
||||
this.dataGridView = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.labelCreate = new System.Windows.Forms.Label();
|
||||
this.buttonSelectAll = new System.Windows.Forms.Button();
|
||||
this.buttonClearAll = new System.Windows.Forms.Button();
|
||||
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.colSize = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colSerial = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colDetails = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.labelCreate = new System.Windows.Forms.Label();
|
||||
this.buttonSelectAll = new System.Windows.Forms.Button();
|
||||
this.buttonClearAll = new System.Windows.Forms.Button();
|
||||
this.colNic = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
@ -60,7 +61,8 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
this.colSize,
|
||||
this.colSerial,
|
||||
this.colId,
|
||||
this.colDetails});
|
||||
this.colDetails,
|
||||
this.colNic});
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.dataGridView, 2);
|
||||
resources.ApplyResources(this.dataGridView, "dataGridView");
|
||||
this.dataGridView.MultiSelect = true;
|
||||
@ -68,36 +70,6 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
this.dataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellClick);
|
||||
this.dataGridView.SelectionChanged += new System.EventHandler(this.dataGridView_SelectionChanged);
|
||||
//
|
||||
// colCheck
|
||||
//
|
||||
this.colCheck.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
|
||||
resources.ApplyResources(this.colCheck, "colCheck");
|
||||
this.colCheck.Name = "colCheck";
|
||||
//
|
||||
// colSize
|
||||
//
|
||||
resources.ApplyResources(this.colSize, "colSize");
|
||||
this.colSize.Name = "colSize";
|
||||
this.colSize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// colSerial
|
||||
//
|
||||
resources.ApplyResources(this.colSerial, "colSerial");
|
||||
this.colSerial.Name = "colSerial";
|
||||
this.colSerial.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// colId
|
||||
//
|
||||
resources.ApplyResources(this.colId, "colId");
|
||||
this.colId.Name = "colId";
|
||||
this.colId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// colDetails
|
||||
//
|
||||
resources.ApplyResources(this.colDetails, "colDetails");
|
||||
this.colDetails.Name = "colDetails";
|
||||
this.colDetails.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// tableLayoutPanel1
|
||||
//
|
||||
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
|
||||
@ -128,6 +100,42 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
this.buttonClearAll.UseVisualStyleBackColor = true;
|
||||
this.buttonClearAll.Click += new System.EventHandler(this.buttonClearAll_Click);
|
||||
//
|
||||
// colCheck
|
||||
//
|
||||
this.colCheck.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
|
||||
resources.ApplyResources(this.colCheck, "colCheck");
|
||||
this.colCheck.Name = "colCheck";
|
||||
//
|
||||
// colSize
|
||||
//
|
||||
resources.ApplyResources(this.colSize, "colSize");
|
||||
this.colSize.Name = "colSize";
|
||||
this.colSize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// colSerial
|
||||
//
|
||||
resources.ApplyResources(this.colSerial, "colSerial");
|
||||
this.colSerial.Name = "colSerial";
|
||||
this.colSerial.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// colId
|
||||
//
|
||||
resources.ApplyResources(this.colId, "colId");
|
||||
this.colId.Name = "colId";
|
||||
this.colId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// colDetails
|
||||
//
|
||||
resources.ApplyResources(this.colDetails, "colDetails");
|
||||
this.colDetails.Name = "colDetails";
|
||||
this.colDetails.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// colNic
|
||||
//
|
||||
resources.ApplyResources(this.colNic, "colNic");
|
||||
this.colNic.Name = "colNic";
|
||||
this.colNic.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// LVMoHBA
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@ -155,5 +163,6 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colSerial;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colDetails;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNic;
|
||||
}
|
||||
}
|
||||
|
||||
@ -112,12 +112,12 @@
|
||||
<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="labelReattach.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
@ -127,11 +127,11 @@
|
||||
<data name="labelCreate.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="labelCreate.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 3</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="labelCreate.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>3, 3, 3, 15</value>
|
||||
</data>
|
||||
@ -148,7 +148,7 @@
|
||||
<value>labelCreate</value>
|
||||
</data>
|
||||
<data name=">>labelCreate.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=">>labelCreate.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
@ -156,7 +156,7 @@
|
||||
<data name=">>labelCreate.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="colCheck.HeaderText" xml:space="preserve">
|
||||
@ -165,7 +165,7 @@
|
||||
<data name="colCheck.Width" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<metadata name="colSize.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="colSize.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="colSize.HeaderText" xml:space="preserve">
|
||||
@ -174,7 +174,7 @@
|
||||
<data name="colSize.MinimumWidth" type="System.Int32, mscorlib">
|
||||
<value>30</value>
|
||||
</data>
|
||||
<metadata name="colSerial.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="colSerial.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="colSerial.HeaderText" xml:space="preserve">
|
||||
@ -183,7 +183,7 @@
|
||||
<data name="colSerial.MinimumWidth" type="System.Int32, mscorlib">
|
||||
<value>30</value>
|
||||
</data>
|
||||
<metadata name="colId.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="colId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="colId.HeaderText" xml:space="preserve">
|
||||
@ -192,7 +192,7 @@
|
||||
<data name="colId.MinimumWidth" type="System.Int32, mscorlib">
|
||||
<value>30</value>
|
||||
</data>
|
||||
<metadata name="colDetails.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<metadata name="colDetails.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="colDetails.HeaderText" xml:space="preserve">
|
||||
@ -201,6 +201,15 @@
|
||||
<data name="colDetails.MinimumWidth" type="System.Int32, mscorlib">
|
||||
<value>30</value>
|
||||
</data>
|
||||
<metadata name="colNic.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<data name="colNic.HeaderText" xml:space="preserve">
|
||||
<value>NIC</value>
|
||||
</data>
|
||||
<data name="colNic.MinimumWidth" type="System.Int32, mscorlib">
|
||||
<value>30</value>
|
||||
</data>
|
||||
<data name="dataGridView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
@ -241,7 +250,7 @@
|
||||
<value>buttonSelectAll</value>
|
||||
</data>
|
||||
<data name=">>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=">>buttonSelectAll.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
@ -265,7 +274,7 @@
|
||||
<value>buttonClearAll</value>
|
||||
</data>
|
||||
<data name=">>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=">>buttonClearAll.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
@ -292,7 +301,7 @@
|
||||
<value>tableLayoutPanel1</value>
|
||||
</data>
|
||||
<data name=">>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=">>tableLayoutPanel1.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
@ -322,7 +331,7 @@
|
||||
<value>labelReattach</value>
|
||||
</data>
|
||||
<data name=">>labelReattach.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=">>labelReattach.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
@ -330,7 +339,7 @@
|
||||
<data name=">>labelReattach.ZOrder" xml:space="preserve">
|
||||
<value>1</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">
|
||||
@ -343,31 +352,37 @@
|
||||
<value>colCheck</value>
|
||||
</data>
|
||||
<data name=">>colCheck.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=">>colSize.Name" xml:space="preserve">
|
||||
<value>colSize</value>
|
||||
</data>
|
||||
<data name=">>colSize.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=">>colSerial.Name" xml:space="preserve">
|
||||
<value>colSerial</value>
|
||||
</data>
|
||||
<data name=">>colSerial.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=">>colId.Name" xml:space="preserve">
|
||||
<value>colId</value>
|
||||
</data>
|
||||
<data name=">>colId.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=">>colDetails.Name" xml:space="preserve">
|
||||
<value>colDetails</value>
|
||||
</data>
|
||||
<data name=">>colDetails.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=">>colNic.Name" xml:space="preserve">
|
||||
<value>colNic</value>
|
||||
</data>
|
||||
<data name=">>colNic.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>LVMoHBA</value>
|
||||
|
||||
@ -386,7 +386,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
public class SrWizardType_Fcoe : SrWizardType
|
||||
{
|
||||
public override bool IsEnhancedSR { get { return false; } }
|
||||
public override string FrontendBlurb { get { return Messages.NEWSR_LVMOHBA_BLURB; } }
|
||||
public override string FrontendBlurb { get { return Messages.NEWSR_LVMOFCOE_BLURB; } }
|
||||
public override SR.SRTypes Type { get { return SR.SRTypes.lvmofcoe; } }
|
||||
public override string ContentType { get { return ""; } }
|
||||
public override bool ShowIntroducePrompt { get { return false; } }
|
||||
@ -395,7 +395,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
|
||||
public override void ResetSrName(IXenConnection connection)
|
||||
{
|
||||
SrName = SrWizardHelpers.DefaultSRName(Messages.NEWSR_HBA_DEFAULT_NAME, connection);
|
||||
SrName = SrWizardHelpers.DefaultSRName(Messages.NEWSR_FCOE_DEFAULT_NAME, connection);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
26
XenModel/Messages.Designer.cs
generated
26
XenModel/Messages.Designer.cs
generated
@ -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.
|
||||
@ -22881,6 +22881,15 @@ namespace XenAdmin {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Software FCoE virtual disk storage.
|
||||
/// </summary>
|
||||
public static string NEWSR_FCOE_DEFAULT_NAME {
|
||||
get {
|
||||
return ResourceManager.GetString("NEWSR_FCOE_DEFAULT_NAME", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Hardware HBA virtual disk storage.
|
||||
/// </summary>
|
||||
@ -22965,7 +22974,20 @@ namespace XenAdmin {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Hardware FCoE SR [{0} - {1}].
|
||||
/// Looks up a localized string similar to XenServer hosts support Fibre Channel (FC), Fibre Channel over Ethernet (FCoE) and shared Serial Attached SCSI (SAS) storage area networks (SANs) using host bus adapters (HBAs).
|
||||
///
|
||||
///All configuration required to expose a LUN to the host must be completed manually, including storage devices, network devices, and the HBA within the XenServer host.
|
||||
///
|
||||
///Once all configuration is complete the HBA will expose a SCSI device backed by the LUN to the host. The SCSI device can then be used to access the LUN as if it we [rest of string was truncated]";.
|
||||
/// </summary>
|
||||
public static string NEWSR_LVMOFCOE_BLURB {
|
||||
get {
|
||||
return ResourceManager.GetString("NEWSR_LVMOFCOE_BLURB", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Software FCoE SR [{0} - {1}].
|
||||
/// </summary>
|
||||
public static string NEWSR_LVMOFCOE_DESCRIPTION {
|
||||
get {
|
||||
|
||||
@ -7817,6 +7817,9 @@ When you configure a CIFS storage repository, you simply provide the hostname or
|
||||
<data name="NEWSR_EQUAL_LOGIC_FILER_PAGE_TITLE" xml:space="preserve">
|
||||
<value>Enter the Dell EqualLogic filer details</value>
|
||||
</data>
|
||||
<data name="NEWSR_FCOE_DEFAULT_NAME" xml:space="preserve">
|
||||
<value>Software FCoE virtual disk storage</value>
|
||||
</data>
|
||||
<data name="NEWSR_HBA_DEFAULT_NAME" xml:space="preserve">
|
||||
<value>Hardware HBA virtual disk storage</value>
|
||||
</data>
|
||||
@ -7846,8 +7849,15 @@ Do you wish to format the disk?</value>
|
||||
<data name="NEWSR_LUN_IN_USE_ON_SERVER" xml:space="preserve">
|
||||
<value>This LUN is already in use as SR {0} on server {1}.</value>
|
||||
</data>
|
||||
<data name="NEWSR_LVMOFCOE_BLURB" xml:space="preserve">
|
||||
<value>XenServer hosts support Fibre Channel (FC), Fibre Channel over Ethernet (FCoE) and shared Serial Attached SCSI (SAS) storage area networks (SANs) using host bus adapters (HBAs).
|
||||
|
||||
All configuration required to expose a LUN to the host must be completed manually, including storage devices, network devices, and the HBA within the XenServer host.
|
||||
|
||||
Once all configuration is complete the HBA will expose a SCSI device backed by the LUN to the host. The SCSI device can then be used to access the LUN as if it were a locally attached SCSI device.</value>
|
||||
</data>
|
||||
<data name="NEWSR_LVMOFCOE_DESCRIPTION" xml:space="preserve">
|
||||
<value>Hardware FCoE SR [{0} - {1}]</value>
|
||||
<value>Software FCoE SR [{0} - {1}]</value>
|
||||
</data>
|
||||
<data name="NEWSR_LVMOHBA_BLURB" xml:space="preserve">
|
||||
<value>XenServer hosts support Fibre Channel (FC), Fibre Channel over Ethernet (FCoE) and shared Serial Attached SCSI (SAS) storage area networks (SANs) using host bus adapters (HBAs).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user