CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs

Fix earlier resolved conflicts

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2017-10-24 14:55:07 +01:00
parent 033e7df8af
commit 59b904eb2d

View File

@ -103,7 +103,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
LvmOhbaSrDescriptor lvmdescr = CreateLvmSrDescriptor(device);
SR.SRTypes srType = lvmdescr is FcoeSrDescriptor ? SR.SRTypes.lvmofcoe : SR.SRTypes.lvmohba; //srType is a workaround instead of SrType
var action = new SrProbeAction(Connection, master, srType, descr.DeviceConfig);// TODO: use SRType and descr
var action = new SrProbeAction(Connection, master, srType, lvmdescr.DeviceConfig);// TODO: use SRType and descr
using (var dlg = new ActionProgressDialog(action, ProgressBarStyle.Marquee))
dlg.ShowDialog(this);