CP-16480: Add gfs2 to the list of XenCenter known sr types

Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>

Conflicts:
	XenModel/FriendlyNames.Designer.cs
	XenModel/FriendlyNames.resx
	XenModel/XenAPI-Extensions/SR.cs
This commit is contained in:
Mihaela Stoica 2016-03-17 16:38:19 +00:00 committed by Gabor Apati-Nagy
parent 4630994198
commit b23ec8136a
3 changed files with 27 additions and 11 deletions

View File

@ -2679,6 +2679,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to GFS2.
/// </summary>
public static string Label_SR_SRTypes_gfs2 {
get {
return ResourceManager.GetString("Label-SR.SRTypes-gfs2", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to VDI-per-LUN iSCSI.
/// </summary>

View File

@ -1835,4 +1835,7 @@
<data name="Message.action-pbd_plug_failed_on_server_start" xml:space="preserve">
<value>Repair Storage</value>
</data>
<data name="Label-SR.SRTypes-gfs2" xml:space="preserve">
<value>GFS2</value>
</data>
</root>

View File

@ -53,7 +53,7 @@ namespace XenAPI
lvmohba, egenera, egeneracd, dummy, unknown, equal, cslg, shm,
iscsi,
ebs, rawhba,
smb, lvmofcoe,
smb, lvmofcoe, gfs2,
nutanix, nutanixiso,
tmpfs
}
@ -229,16 +229,20 @@ namespace XenAPI
/// </summary>
public bool CanCreateWithXenCenter()
{
SRTypes typ = GetSRType(false);
return typ == SRTypes.iso
|| typ == SRTypes.lvmoiscsi
|| typ == SRTypes.nfs
|| typ == SRTypes.equal
|| typ == SRTypes.netapp
|| typ == SRTypes.lvmohba
|| typ == SRTypes.cslg
|| typ == SRTypes.smb
|| typ == SRTypes.lvmofcoe;
get
{
SRTypes type = GetSRType(false);
return type == SRTypes.iso
|| type == SRTypes.lvmoiscsi
|| type == SRTypes.nfs
|| type == SRTypes.equal
|| type == SRTypes.netapp
|| type == SRTypes.lvmohba
|| type == SRTypes.cslg
|| type == SRTypes.smb
|| type == SRTypes.lvmofcoe
|| type == SRTypes.gfs2;
}
}
public bool IsLocalSR()