Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed the additional (failing) experimental featurecheck of corosync and sriov. Know the regular checks are used.

Browse Source
This commit is contained in:
Alexander Schulz 2018-11-08 20:17:37 +01:00
parent a16d331cfd
commit 44cc706d4c
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs
View File

@ -109,14 +109,14 @@ namespace XenAdmin.Wizards.NewNetworkWizard_Pages
iconWarningSriovOption.Visible = labelWarningSriovOption.Visible = false;
rbtnSriov.Visible = labelSriov.Visible = false;
}
else if (Helpers.FeatureForbidden(pool.Connection, Host.SriovNetworkDisabled) ||
else if (Helpers.FeatureForbidden(pool.Connection, Host.RestrictSriovNetwork) ||
sriovFeatureForbidden || !pool.HasSriovNic() || !hasNicCanEnableSriov)
{
rbtnSriov.Checked = false;
rbtnSriov.Enabled = labelSriov.Enabled = false;
labelWarningSriovOption.Text =
Helpers.FeatureForbidden(pool.Connection, Host.SriovNetworkDisabled)
Helpers.FeatureForbidden(pool.Connection, Host.RestrictSriovNetwork)
? String.Format(Messages.FEATURE_EXPERIMENTAL, Messages.NETWORK_SRIOV)
: sriovFeatureForbidden
? String.Format(Messages.FEATURE_DISABLED, Messages.NETWORK_SRIOV)

6
XenAdmin/Wizards/NewSRWizard.cs
View File

@ -171,7 +171,7 @@ namespace XenAdmin.Wizards
check.AddApiCheckRange(new RbacMethodList("SR.probe"));
if (Helpers.KolkataOrGreater(xenConnection) && !Helpers.FeatureForbidden(xenConnection, Host.CorosyncDisabled))
if (Helpers.KolkataOrGreater(xenConnection) && !Helpers.FeatureForbidden(xenConnection, Host.RestrictCorosync))
check.AddApiCheckRange(new RbacMethodList("SR.probe_ext"));
if (_srToReattach == null)
@ -290,7 +290,7 @@ namespace XenAdmin.Wizards
else if (m_srWizardType is SrWizardType_Iscsi)
{
showProvisioningPage = Helpers.KolkataOrGreater(xenConnection) &&
!Helpers.FeatureForbidden(xenConnection, Host.CorosyncDisabled);
!Helpers.FeatureForbidden(xenConnection, Host.RestrictCorosync);
if (showProvisioningPage)
AddPage(xenTabPageChooseSrProv);
AddPage(xenTabPageLvmoIscsi);
@ -298,7 +298,7 @@ namespace XenAdmin.Wizards
else if (m_srWizardType is SrWizardType_Hba)
{
showProvisioningPage = Helpers.KolkataOrGreater(xenConnection) &&
!Helpers.FeatureForbidden(xenConnection, Host.CorosyncDisabled);
!Helpers.FeatureForbidden(xenConnection, Host.RestrictCorosync);
if (showProvisioningPage)
AddPage(xenTabPageChooseSrProv);
AddPage(xenTabPageLvmoHba);

2
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
View File

@ -101,7 +101,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
var existingSrDescriptors = new List<FibreChannelDescriptor>();
var formatDiskDescriptors = new List<FibreChannelDescriptor>();
var performSecondProbe = Helpers.KolkataOrGreater(Connection) && !Helpers.FeatureForbidden(Connection, Host.CorosyncDisabled)
var performSecondProbe = Helpers.KolkataOrGreater(Connection) && !Helpers.FeatureForbidden(Connection, Host.RestrictCorosync)
&& SrType != SR.SRTypes.lvmofcoe; // gfs2 over fcoe is not supported yet
foreach (var device in _selectedDevices)

2
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
View File

@ -154,7 +154,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends
}
var performSecondProbe = Helpers.KolkataOrGreater(Connection) &&
!Helpers.FeatureForbidden(Connection, Host.CorosyncDisabled);
!Helpers.FeatureForbidden(Connection, Host.RestrictCorosync);
if (performSecondProbe && srs.Count == 0)
{
// Start second probe

26
XenModel/XenAPI-Extensions/Host.cs
View File

@ -50,8 +50,8 @@ namespace XenAPI
public enum Edition
{
Free,
PerSocket, //Added in Clearwater (PR-1589)
XenDesktop, //Added in Clearwater (PR-1589) and is new form of "EnterpriseXD"
PerSocket, //Added in Clearwater (PR-1589)
XenDesktop, //Added in Clearwater (PR-1589) and is new form of "EnterpriseXD"
StandardPerSocket, // Added in Creedence (standard-per-socket)
Desktop, // Added in Creedence (desktop)
Standard, // Added in Dundee/Violet (standard)
@ -348,8 +348,8 @@ namespace XenAPI
public static bool RestrictExportResourceData(Host h)
{
return BoolKeyPreferTrue(h.license_params, "restrict_export_resource_data");
}
return BoolKeyPreferTrue(h.license_params, "restrict_export_resource_data");
}
public static bool RestrictIntraPoolMigrate(Host h)
{
@ -445,17 +445,17 @@ namespace XenAPI
return BoolKeyPreferTrue(h.license_params, "restrict_corosync");
}
#region Experimental Features
//#region Experimental Features
public static bool CorosyncDisabled(Host h)
{
return RestrictCorosync(h) && FeatureDisabled(h, "corosync");
}
//public static bool CorosyncDisabled(Host h)
//{
// return RestrictCorosync(h) && FeatureDisabled(h, "corosync");
//}
public static bool SriovNetworkDisabled(Host h)
{
return RestrictSriovNetwork(h) && FeatureDisabled(h, "network_sriov");
}
//public static bool SriovNetworkDisabled(Host h)
//{
// return RestrictSriovNetwork(h) && FeatureDisabled(h, "network_sriov");
//}
public static bool UefiBootDisabled(Host h)
{