mirror of
https://github.com/xcp-ng/xenadmin.git
synced 2024-11-23 20:36:33 +01:00
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com> Conflicts: XenAdmin/Wizards/NewSRWizard.cs XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
This commit is contained in:
Mihaela Stoica
Gabor Apati-Nagy
parent
3bab5186f8
commit
6249663ae2
@ -212,8 +212,9 @@ namespace XenAdmin.Wizards
|
||||
lvmOhbaSrDescriptor.Description = description;
|
||||
|
||||
m_srWizardType.SrDescriptors.Add(lvmOhbaSrDescriptor);
|
||||
m_srWizardType.IsGfs2 = lvmOhbaSrDescriptor is Gfs2SrDescriptor;
|
||||
names.Add(name);
|
||||
name = SrWizardHelpers.DefaultSRName(m_srWizardType is SrWizardType_LvmoHba
|
||||
name = SrWizardHelpers.DefaultSRName(m_srWizardType is SrWizardType_Hba
|
||||
? Messages.NEWSR_HBA_DEFAULT_NAME
|
||||
: Messages.NEWSR_FCOE_DEFAULT_NAME, names);
|
||||
}
|
||||
@ -241,7 +242,7 @@ namespace XenAdmin.Wizards
|
||||
{
|
||||
return SetFCDevicesOnLVMoHBAPage(xenTabPageLvmoFcoe);
|
||||
}
|
||||
if (m_srWizardType is SrWizardType_LvmoHba)
|
||||
if (m_srWizardType is SrWizardType_Hba)
|
||||
{
|
||||
return SetFCDevicesOnLVMoHBAPage(xenTabPageLvmoHba);
|
||||
}
|
||||
@ -257,7 +258,7 @@ namespace XenAdmin.Wizards
|
||||
return CanShowLVMoHBASummaryPage(xenTabPageLvmoFcoe.SrDescriptors);
|
||||
}
|
||||
|
||||
if (m_srWizardType is SrWizardType_LvmoHba)
|
||||
if (m_srWizardType is SrWizardType_Hba)
|
||||
{
|
||||
if (senderPage == xenTabPageLvmoHba)
|
||||
{
|
||||
@ -283,7 +284,7 @@ namespace XenAdmin.Wizards
|
||||
{
|
||||
AddPage(xenTabPageLvmoIscsi);
|
||||
}
|
||||
else if (m_srWizardType is SrWizardType_LvmoHba)
|
||||
else if (m_srWizardType is SrWizardType_Hba)
|
||||
{
|
||||
AddPage(xenTabPageLvmoHba);
|
||||
AddPage(xenTabPageLvmoHbaSummary);
|
||||
@ -337,7 +338,7 @@ namespace XenAdmin.Wizards
|
||||
xenTabPageVhdoNFS.SrWizardType = m_srWizardType;
|
||||
else if (m_srWizardType is SrWizardType_Iscsi)
|
||||
xenTabPageLvmoIscsi.SrWizardType = m_srWizardType;
|
||||
else if (m_srWizardType is SrWizardType_LvmoHba)
|
||||
else if (m_srWizardType is SrWizardType_Hba)
|
||||
xenTabPageLvmoHba.SrWizardType = m_srWizardType;
|
||||
else if (m_srWizardType is SrWizardType_Cslg || m_srWizardType is SrWizardType_NetApp || m_srWizardType is SrWizardType_EqualLogic)
|
||||
xenTabPageCslg.SrWizardType = m_srWizardType;
|
||||
@ -368,7 +369,7 @@ namespace XenAdmin.Wizards
|
||||
|
||||
m_srWizardType.UUID = xenTabPageLvmoIscsi.UUID;
|
||||
m_srWizardType.DeviceConfig = xenTabPageLvmoIscsi.DeviceConfig;
|
||||
m_srWizardType.IsLVM = xenTabPageLvmoIscsi.SRType == SR.SRTypes.lvmoiscsi;
|
||||
m_srWizardType.IsGfs2 = xenTabPageLvmoIscsi.SRType == SR.SRTypes.gfs2;
|
||||
}
|
||||
else if (senderPagetype == typeof(NFS_ISO))
|
||||
{
|
||||
@ -450,7 +451,7 @@ namespace XenAdmin.Wizards
|
||||
|
||||
protected override void FinishWizard()
|
||||
{
|
||||
if (m_srWizardType is SrWizardType_LvmoHba || m_srWizardType is SrWizardType_Fcoe)
|
||||
if (m_srWizardType is SrWizardType_Hba || m_srWizardType is SrWizardType_Fcoe)
|
||||
{
|
||||
base.FinishWizard();
|
||||
return;
|
||||
@ -534,7 +535,7 @@ namespace XenAdmin.Wizards
|
||||
ProgressBarStyle progressBarStyle = FinalAction is SrIntroduceAction ? ProgressBarStyle.Blocks : ProgressBarStyle.Marquee;
|
||||
using (var dialog = new ActionProgressDialog(FinalAction, progressBarStyle) {ShowCancel = true})
|
||||
{
|
||||
if (m_srWizardType is SrWizardType_LvmoHba || m_srWizardType is SrWizardType_Fcoe)
|
||||
if (m_srWizardType is SrWizardType_Hba || 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.
|
||||
@ -548,7 +549,7 @@ namespace XenAdmin.Wizards
|
||||
dialog.ShowDialog(this);
|
||||
}
|
||||
|
||||
if (m_srWizardType is SrWizardType_LvmoHba || m_srWizardType is SrWizardType_Fcoe)
|
||||
if (m_srWizardType is SrWizardType_Hba || m_srWizardType is SrWizardType_Fcoe)
|
||||
{
|
||||
foreach (var asyncAction in actionList)
|
||||
{
|
||||
|
||||
@ -58,7 +58,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
// Store the SrWizardType on the tag of their RadioButton
|
||||
radioButtonNfs.Tag = new SrWizardType_VhdoNfs();
|
||||
radioButtonIscsi.Tag = new SrWizardType_Iscsi();
|
||||
radioButtonFibreChannel.Tag = new SrWizardType_LvmoHba();
|
||||
radioButtonFibreChannel.Tag = new SrWizardType_Hba();
|
||||
radioButtonNfsIso.Tag = new SrWizardType_NfsIso();
|
||||
radioButtonCifsIso.Tag = new SrWizardType_CifsIso();
|
||||
radioButtonCslg.Tag = new SrWizardType_Cslg();
|
||||
@ -171,7 +171,8 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
radioButtonCslg.Checked = true;
|
||||
radioButtonCslg.Tag = ((SrWizardType_Cslg)radioButtonCslg.Tag).ToEqualLogic();
|
||||
}
|
||||
else if (wizardType.Type.ToString() == SrToReattach.type)
|
||||
else if (wizardType.PossibleTypes.Contains(SrToReattach.GetSRType(true)))
|
||||
|
||||
{
|
||||
if (_matchingFrontends == 0)
|
||||
radioButton.Checked = true;
|
||||
|
||||
@ -42,13 +42,20 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
|
||||
#region LVMoHBA overrides
|
||||
|
||||
public override SR.SRTypes SrType { get { return SR.SRTypes.lvmofcoe; } }
|
||||
public override SR.SRTypes SrType { get { return srProvisioningMethod.Lvm ? SR.SRTypes.lvmofcoe : SR.SRTypes.gfs2; } }
|
||||
|
||||
public override bool ShowNicColumn { get { return true; } }
|
||||
|
||||
public override string HelpID { get { return "Location_FCOE"; } }
|
||||
|
||||
public override LvmOhbaSrDescriptor CreateSrDescriptor(FibreChannelDevice device)
|
||||
public virtual LvmOhbaSrDescriptor CreateSrDescriptor(FibreChannelDevice device)
|
||||
{
|
||||
if (SrType == SR.SRTypes.gfs2)
|
||||
return new Gfs2SrDescriptor(device);
|
||||
return new FcoeSrDescriptor(device);
|
||||
}
|
||||
|
||||
public virtual LvmOhbaSrDescriptor CreateLvmSrDescriptor(FibreChannelDevice device)
|
||||
{
|
||||
return new FcoeSrDescriptor(device);
|
||||
}
|
||||
|
||||
@ -56,11 +56,16 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public virtual SR.SRTypes SrType { get { return SR.SRTypes.lvmohba; } }
|
||||
public virtual SR.SRTypes SrType { get { return srProvisioningMethod.Lvm ? SR.SRTypes.lvmohba : SR.SRTypes.gfs2; } }
|
||||
|
||||
public virtual bool ShowNicColumn { get { return false; } }
|
||||
|
||||
public virtual LvmOhbaSrDescriptor CreateSrDescriptor(FibreChannelDevice device)
|
||||
{
|
||||
return SrType == SR.SRTypes.gfs2 ? new Gfs2SrDescriptor(device) : new LvmOhbaSrDescriptor(device, Connection);
|
||||
}
|
||||
|
||||
public virtual LvmOhbaSrDescriptor CreateLvmSrDescriptor(FibreChannelDevice device)
|
||||
{
|
||||
return new LvmOhbaSrDescriptor(device, Connection);
|
||||
}
|
||||
|
||||
@ -31,16 +31,17 @@ 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.colNic = 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.srProvisioningMethod = new XenAdmin.Controls.SrProvisioningMethod();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
|
||||
this.tableLayoutPanel1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
@ -70,36 +71,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);
|
||||
//
|
||||
// tableLayoutPanel1
|
||||
//
|
||||
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
|
||||
this.tableLayoutPanel1.Controls.Add(this.labelCreate, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.labelReattach, 0, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 2);
|
||||
this.tableLayoutPanel1.Controls.Add(this.buttonSelectAll, 0, 3);
|
||||
this.tableLayoutPanel1.Controls.Add(this.buttonClearAll, 1, 3);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
//
|
||||
// labelCreate
|
||||
//
|
||||
resources.ApplyResources(this.labelCreate, "labelCreate");
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.labelCreate, 2);
|
||||
this.labelCreate.Name = "labelCreate";
|
||||
//
|
||||
// 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);
|
||||
//
|
||||
// colCheck
|
||||
//
|
||||
this.colCheck.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
|
||||
@ -136,6 +107,44 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
this.colNic.Name = "colNic";
|
||||
this.colNic.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
|
||||
//
|
||||
// tableLayoutPanel1
|
||||
//
|
||||
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
|
||||
this.tableLayoutPanel1.Controls.Add(this.labelCreate, 0, 0);
|
||||
this.tableLayoutPanel1.Controls.Add(this.labelReattach, 0, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.dataGridView, 0, 2);
|
||||
this.tableLayoutPanel1.Controls.Add(this.buttonSelectAll, 0, 3);
|
||||
this.tableLayoutPanel1.Controls.Add(this.buttonClearAll, 1, 3);
|
||||
this.tableLayoutPanel1.Controls.Add(this.srProvisioningMethod, 0, 4);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
//
|
||||
// labelCreate
|
||||
//
|
||||
resources.ApplyResources(this.labelCreate, "labelCreate");
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.labelCreate, 2);
|
||||
this.labelCreate.Name = "labelCreate";
|
||||
//
|
||||
// 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);
|
||||
//
|
||||
// srProvisioningMethod
|
||||
//
|
||||
this.srProvisioningMethod.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.tableLayoutPanel1.SetColumnSpan(this.srProvisioningMethod, 2);
|
||||
resources.ApplyResources(this.srProvisioningMethod, "srProvisioningMethod");
|
||||
this.srProvisioningMethod.Name = "srProvisioningMethod";
|
||||
//
|
||||
// LVMoHBA
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
@ -164,5 +173,6 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colId;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colDetails;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNic;
|
||||
protected Controls.SrProvisioningMethod srProvisioningMethod;
|
||||
}
|
||||
}
|
||||
|
||||
@ -217,7 +217,7 @@
|
||||
<value>3, 65</value>
|
||||
</data>
|
||||
<data name="dataGridView.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>554, 327</value>
|
||||
<value>554, 277</value>
|
||||
</data>
|
||||
<data name="dataGridView.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
@ -235,7 +235,7 @@
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="buttonSelectAll.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 398</value>
|
||||
<value>3, 348</value>
|
||||
</data>
|
||||
<data name="buttonSelectAll.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
@ -259,7 +259,7 @@
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="buttonClearAll.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>84, 398</value>
|
||||
<value>84, 348</value>
|
||||
</data>
|
||||
<data name="buttonClearAll.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
@ -282,6 +282,33 @@
|
||||
<data name=">>buttonClearAll.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="srProvisioningMethod.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Top</value>
|
||||
</data>
|
||||
<data name="srProvisioningMethod.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 377</value>
|
||||
</data>
|
||||
<data name="srProvisioningMethod.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>330, 44</value>
|
||||
</data>
|
||||
<data name="srProvisioningMethod.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>554, 44</value>
|
||||
</data>
|
||||
<data name="srProvisioningMethod.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name=">>srProvisioningMethod.Name" xml:space="preserve">
|
||||
<value>srProvisioningMethod</value>
|
||||
</data>
|
||||
<data name=">>srProvisioningMethod.Type" xml:space="preserve">
|
||||
<value>XenAdmin.Controls.SrProvisioningMethod, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>srProvisioningMethod.Parent" xml:space="preserve">
|
||||
<value>tableLayoutPanel1</value>
|
||||
</data>
|
||||
<data name=">>srProvisioningMethod.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
@ -289,7 +316,7 @@
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>560, 424</value>
|
||||
@ -310,7 +337,7 @@
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelCreate" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelReattach" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="dataGridView" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="buttonSelectAll" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="buttonClearAll" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0" /></TableLayoutSettings></value>
|
||||
<value><?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="labelCreate" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="labelReattach" Row="1" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="dataGridView" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="buttonSelectAll" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="buttonClearAll" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="srProvisioningMethod" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,120" /></TableLayoutSettings></value>
|
||||
</data>
|
||||
<data name="labelReattach.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 34</value>
|
||||
|
||||
@ -84,6 +84,18 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
}
|
||||
}
|
||||
|
||||
public class Gfs2SrDescriptor : LvmOhbaSrDescriptor
|
||||
{
|
||||
private const string URIFORMAT = "file:///dev/disk/by-id/scsi-{0}"; // uri=file:///dev/disk/by-id/scsi-<SCSIID>
|
||||
|
||||
public Gfs2SrDescriptor(FibreChannelDevice device)
|
||||
: base(device)
|
||||
{
|
||||
DeviceConfig[SrProbeAction.URI] = string.Format(URIFORMAT, device.SCSIid);
|
||||
Description = string.Format(Messages.NEWSR_LVMOHBA_DESCRIPTION, device.Vendor, device.Serial);
|
||||
}
|
||||
}
|
||||
|
||||
public abstract class SrWizardType
|
||||
{
|
||||
protected SrWizardType()
|
||||
@ -107,7 +119,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
public abstract bool ShowIntroducePrompt { get; }
|
||||
public abstract bool ShowReattachWarning { get; }
|
||||
public abstract bool AllowToCreateNewSr { get; set; }
|
||||
public virtual bool IsLVM { get { return false; } set { } }
|
||||
public virtual bool IsGfs2 { get { return false; } set { } }
|
||||
|
||||
public string SrName
|
||||
{
|
||||
@ -188,6 +200,8 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
{
|
||||
SrName = SrWizardHelpers.DefaultSRName(String.Format(Messages.SRWIZARD_STORAGE_NAME, SR.getFriendlyTypeName(Type)), connection);
|
||||
}
|
||||
|
||||
public virtual IEnumerable<SR.SRTypes> PossibleTypes { get { return new SR.SRTypes[] { Type }; } }
|
||||
}
|
||||
|
||||
public class SrWizardType_CifsIso : SrWizardType
|
||||
@ -217,40 +231,39 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
public override bool IsEnhancedSR { get { return false; } }
|
||||
public override string FrontendBlurb { get { return Messages.NEWSR_LVMOISCSI_BLURB; } }
|
||||
public override string FrontendTypeName { get { return Messages.NEWSR_LVMOISCSI_TYPE_NAME; } }
|
||||
public override SR.SRTypes Type { get { return IsLVM ? SR.SRTypes.lvmoiscsi : SR.SRTypes.gfs2; } }
|
||||
public override SR.SRTypes Type { get { return IsGfs2 ? SR.SRTypes.gfs2 : SR.SRTypes.lvmoiscsi; } }
|
||||
public override string ContentType { get { return ""; } }
|
||||
public override bool ShowIntroducePrompt { get { return false; } }
|
||||
public override bool ShowReattachWarning { get { return true; } }
|
||||
public override bool AllowToCreateNewSr { get; set; }
|
||||
|
||||
private bool isLVM = true;
|
||||
public override bool IsLVM
|
||||
{
|
||||
get { return isLVM; }
|
||||
set { isLVM = value; }
|
||||
}
|
||||
public override bool IsGfs2 { get; set; }
|
||||
|
||||
public override void ResetSrName(IXenConnection connection)
|
||||
{
|
||||
SrName = SrWizardHelpers.DefaultSRName(Messages.SRWIZARD_ISCSI_STORAGE, connection);
|
||||
}
|
||||
|
||||
public override IEnumerable<SR.SRTypes> PossibleTypes { get { return new SR.SRTypes[] { SR.SRTypes.lvmoiscsi, SR.SRTypes.gfs2 }; } }
|
||||
}
|
||||
|
||||
public class SrWizardType_LvmoHba : SrWizardType
|
||||
public class SrWizardType_Hba : SrWizardType
|
||||
{
|
||||
public override bool IsEnhancedSR { get { return false; } }
|
||||
public override string FrontendBlurb { get { return Messages.NEWSR_LVMOHBA_BLURB; } }
|
||||
public override string FrontendTypeName { get { return Messages.NEWSR_LVMOHBA_TYPE_NAME; } }
|
||||
public override SR.SRTypes Type { get { return SR.SRTypes.lvmohba; } }
|
||||
public override SR.SRTypes Type { get { return IsGfs2 ? SR.SRTypes.gfs2 : SR.SRTypes.lvmohba; } }
|
||||
public override string ContentType { get { return ""; } }
|
||||
public override bool ShowIntroducePrompt { get { return false; } }
|
||||
public override bool ShowReattachWarning { get { return true; } }
|
||||
public override bool AllowToCreateNewSr { get; set; }
|
||||
public override bool IsGfs2 { get; set; }
|
||||
|
||||
public override void ResetSrName(IXenConnection connection)
|
||||
{
|
||||
SrName = SrWizardHelpers.DefaultSRName(Messages.NEWSR_HBA_DEFAULT_NAME, connection);
|
||||
}
|
||||
|
||||
public override IEnumerable<SR.SRTypes> PossibleTypes { get { return new SR.SRTypes[] { SR.SRTypes.lvmohba, SR.SRTypes.gfs2 }; } }
|
||||
}
|
||||
|
||||
public class SrWizardType_VhdoNfs : SrWizardType
|
||||
@ -392,15 +405,18 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
|
||||
public override bool IsEnhancedSR { get { return false; } }
|
||||
public override string FrontendBlurb { get { return Messages.NEWSR_LVMOFCOE_BLURB; } }
|
||||
public override string FrontendTypeName { get { return Messages.NEWSR_LVMOFCOE_TYPE_NAME; } }
|
||||
public override SR.SRTypes Type { get { return SR.SRTypes.lvmofcoe; } }
|
||||
public override SR.SRTypes Type { get { return IsGfs2 ? SR.SRTypes.gfs2 : SR.SRTypes.lvmofcoe; } }
|
||||
public override string ContentType { get { return ""; } }
|
||||
public override bool ShowIntroducePrompt { get { return false; } }
|
||||
public override bool ShowReattachWarning { get { return true; } }
|
||||
public override bool AllowToCreateNewSr { get; set; }
|
||||
public override bool IsGfs2 { get; set; }
|
||||
|
||||
public override void ResetSrName(IXenConnection connection)
|
||||
{
|
||||
SrName = SrWizardHelpers.DefaultSRName(Messages.NEWSR_FCOE_DEFAULT_NAME, connection);
|
||||
}
|
||||
|
||||
public override IEnumerable<SR.SRTypes> PossibleTypes { get { return new SR.SRTypes[] { SR.SRTypes.lvmofcoe, SR.SRTypes.gfs2 }; } }
|
||||
}
|
||||
}
|
||||
|
||||
@ -205,6 +205,12 @@
|
||||
<Compile Include="Controls\SpinnerIcon.designer.cs">
|
||||
<DependentUpon>SpinnerIcon.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Controls\SrProvisioningMethod.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Controls\SrProvisioningMethod.Designer.cs">
|
||||
<DependentUpon>SrProvisioningMethod.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Controls\Tags\TagList.cs" />
|
||||
<Compile Include="Controls\Tags\TagButton.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
@ -1501,6 +1507,15 @@
|
||||
<EmbeddedResource Include="Controls\PvsCacheStorageRow.zh-CN.resx">
|
||||
<DependentUpon>PvsCacheStorageRow.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Controls\SrProvisioningMethod.ja.resx">
|
||||
<DependentUpon>SrProvisioningMethod.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Controls\SrProvisioningMethod.resx">
|
||||
<DependentUpon>SrProvisioningMethod.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Controls\SrProvisioningMethod.zh-CN.resx">
|
||||
<DependentUpon>SrProvisioningMethod.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Controls\XenSearch\QueryPanel.ja.resx">
|
||||
<DependentUpon>QueryPanel.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
@ -46,6 +46,7 @@ namespace XenAdmin.Actions
|
||||
public const String DEVICE = "device";
|
||||
public const String SCSIid = "SCSIid";
|
||||
public const String PATH = "path";
|
||||
public const String URI = "uri";
|
||||
|
||||
private readonly Dictionary<String, String> smconf;
|
||||
/// <summary>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user