Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #892 from robhoes/master

Browse Source 
Add Standard license edition
This commit is contained in:
Mihaela Stoica 2016-03-10 14:17:27 +00:00
commit 96c36f653f
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/Dialogs/LicenseManager/LicenseStatus.cs
View File

@ -1,4 +1,4 @@
/* Copyright (c) Citrix Systems Inc. /* Copyright (c) Citrix Systems Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, * Redistribution and use in source and binary forms,
@ -335,6 +335,8 @@ namespace XenAdmin.Dialogs
return Messages.LICENSE_SUPPORT_AND_DESKTOP_FEATURES_ENABLED; return Messages.LICENSE_SUPPORT_AND_DESKTOP_FEATURES_ENABLED;
if (XenObject.Connection.Cache.Hosts.All(h => h.PremiumFeaturesEnabled)) if (XenObject.Connection.Cache.Hosts.All(h => h.PremiumFeaturesEnabled))
return Messages.LICENSE_SUPPORT_AND_PREMIUM_FEATURES_ENABLED; return Messages.LICENSE_SUPPORT_AND_PREMIUM_FEATURES_ENABLED;
if (XenObject.Connection.Cache.Hosts.All(h => h.StandardFeaturesEnabled))
return Messages.LICENSE_SUPPORT_AND_STANDARD_FEATURES_ENABLED;
if (XenObject.Connection.Cache.Hosts.All(h => h.EligibleForSupport)) if (XenObject.Connection.Cache.Hosts.All(h => h.EligibleForSupport))
return Messages.LICENSE_SUPPORT_AND_STANDARD_FEATURES_ENABLED; return Messages.LICENSE_SUPPORT_AND_STANDARD_FEATURES_ENABLED;
return Messages.LICENSE_NOT_ELIGIBLE_FOR_SUPPORT; return Messages.LICENSE_NOT_ELIGIBLE_FOR_SUPPORT;

11
XenModel/FriendlyNames.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.18444 // Runtime Version:4.0.30319.34209
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -879,6 +879,15 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to [Citrix] [XenServer product] Standard Edition.
/// </summary>
public static string Label_host_edition_standard {
get {
return ResourceManager.GetString("Label-host.edition-standard", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to [XenServer product] Standard Per-Socket. /// Looks up a localized string similar to [XenServer product] Standard Per-Socket.
/// </summary> /// </summary>

3
XenModel/FriendlyNames.resx
View File

@ -1856,4 +1856,7 @@
<data name="Label-host.system_status-conntest" xml:space="preserve"> <data name="Label-host.system_status-conntest" xml:space="preserve">
<value>Connection test</value> <value>Connection test</value>
</data> </data>
<data name="Label-host.edition-standard" xml:space="preserve">
<value>[Citrix] [XenServer product] Standard Edition</value>
</data>
</root> </root>

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

@ -1,4 +1,4 @@
/* Copyright (c) Citrix Systems Inc. /* Copyright (c) Citrix Systems Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, * Redistribution and use in source and binary forms,
@ -60,7 +60,8 @@ namespace XenAPI
StandardPerSocket, // Added in Creedence (standard-per-socket) StandardPerSocket, // Added in Creedence (standard-per-socket)
Desktop, // Added in Creedence (desktop) Desktop, // Added in Creedence (desktop)
DesktopPlus, // Added in Creedence (desktop-plus) DesktopPlus, // Added in Creedence (desktop-plus)
Premium // Added in Indigo (premium) Premium, // Added in Indigo (premium)
Standard // Added in Dundee/Violet (standard)
} }
public static string LicenseServerWebConsolePort = "8082"; public static string LicenseServerWebConsolePort = "8082";
@ -104,6 +105,8 @@ namespace XenAPI
return Edition.Free; return Edition.Free;
case "premium": case "premium":
return Edition.Premium; return Edition.Premium;
case "standard":
return Edition.Standard;
default: default:
return Edition.Free; return Edition.Free;
} }
@ -155,6 +158,8 @@ namespace XenAPI
return "desktop-plus"; return "desktop-plus";
case Edition.Premium: case Edition.Premium:
return "premium"; return "premium";
case Edition.Standard:
return "standard";
default: default:
return "free"; return "free";
} }
@ -1429,6 +1434,14 @@ namespace XenAPI
} }
} }
public bool StandardFeaturesEnabled
{
get
{
return GetEdition(edition) == Edition.Standard;
}
}
public bool EligibleForSupport public bool EligibleForSupport
{ {
get get