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

Merge pull request #786 from MihaelaStoica/CP-15407

Browse Source 
CP-15407: Add license editions
This commit is contained in:
Gabor Apati-Nagy 2016-01-26 11:32:54 +00:00
commit 249489220b
5 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -928,6 +928,10 @@ namespace XenAdmin.TabPages
// enforced anyway.
info.Remove("sockets");
// Remove "expiry" field for "basic" license
if (!string.IsNullOrEmpty(host.edition) && host.edition == "basic")
info.Remove("expiry");
if (info.ContainsKey("expiry"))
{
ToolStripMenuItem editItem = new ToolStripMenuItem(Messages.LAUNCH_LICENSE_MANAGER);

64
XenModel/FriendlyNames.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -151,7 +151,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to The configuration settings of Citrix Storagelink.
/// Looks up a localized string similar to The configuration settings of @BRANDING_COMPANY_NAME_SHORT@ Storagelink.
/// </summary>
public static string Description_host_system_status_CVSM {
get {
@ -403,7 +403,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Xserver authority files.
/// Looks up a localized string similar to X server authority files.
/// </summary>
public static string Description_host_system_status_X11_auth {
get {
@ -762,6 +762,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Basic Edition.
/// </summary>
public static string Label_host_edition_basic {
get {
return ResourceManager.GetString("Label-host.edition-basic", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to XenApp/XenDesktop.
/// </summary>
@ -852,6 +861,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Premium Edition.
/// </summary>
public static string Label_host_edition_premium {
get {
return ResourceManager.GetString("Label-host.edition-premium", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to @BRANDING_PRODUCT_BRAND@ Standard Per-Socket.
/// </summary>
@ -1015,7 +1033,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ Dell Enterprise Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Dell Enterprise Edition.
/// </summary>
public static string Label_host_sku_type_dell_xe_enterprise {
get {
@ -1024,7 +1042,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ Dell Express Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Dell Express Edition.
/// </summary>
public static string Label_host_sku_type_dell_xe_express {
get {
@ -1033,7 +1051,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ Dell Server Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Dell Server Edition.
/// </summary>
public static string Label_host_sku_type_dell_xe_server {
get {
@ -1042,7 +1060,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix Essentials for @BRANDING_PRODUCT_BRAND@, Dell Enterprise Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ Essentials for @BRANDING_PRODUCT_BRAND@, Dell Enterprise Edition.
/// </summary>
public static string Label_host_sku_type_FG_dell_xe_enterprise {
get {
@ -1051,7 +1069,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ Dell Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Dell Edition.
/// </summary>
public static string Label_host_sku_type_FG_dell_xe_express {
get {
@ -1060,7 +1078,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix Essentials for @BRANDING_PRODUCT_BRAND@, Dell Enterprise Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ Essentials for @BRANDING_PRODUCT_BRAND@, Dell Enterprise Edition.
/// </summary>
public static string Label_host_sku_type_FG_dell_xe_server {
get {
@ -1069,7 +1087,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix Essentials for @BRANDING_PRODUCT_BRAND@, HP Enterprise Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ Essentials for @BRANDING_PRODUCT_BRAND@, HP Enterprise Edition.
/// </summary>
public static string Label_host_sku_type_FG_hp_xe_enterprise {
get {
@ -1078,7 +1096,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ HP Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ HP Edition.
/// </summary>
public static string Label_host_sku_type_FG_hp_xe_express {
get {
@ -1087,7 +1105,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix Essentials for @BRANDING_PRODUCT_BRAND@, HP Enterprise Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ Essentials for @BRANDING_PRODUCT_BRAND@, HP Enterprise Edition.
/// </summary>
public static string Label_host_sku_type_FG_hp_xe_server {
get {
@ -1096,7 +1114,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix Essentials for @BRANDING_PRODUCT_BRAND@.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ Essentials for @BRANDING_PRODUCT_BRAND@.
/// </summary>
public static string Label_host_sku_type_FG_xe_enterprise {
get {
@ -1105,7 +1123,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@.
/// </summary>
public static string Label_host_sku_type_FG_xe_express {
get {
@ -1114,7 +1132,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix Essentials for @BRANDING_PRODUCT_BRAND@.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ Essentials for @BRANDING_PRODUCT_BRAND@.
/// </summary>
public static string Label_host_sku_type_FG_xe_server {
get {
@ -1123,7 +1141,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ HP Enterprise Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ HP Enterprise Edition.
/// </summary>
public static string Label_host_sku_type_hp_xe_enterprise {
get {
@ -1132,7 +1150,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ HP Select Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ HP Select Edition.
/// </summary>
public static string Label_host_sku_type_hp_xe_express {
get {
@ -1141,7 +1159,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ HP Server Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ HP Server Edition.
/// </summary>
public static string Label_host_sku_type_hp_xe_server {
get {
@ -1150,7 +1168,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ Enterprise Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Enterprise Edition.
/// </summary>
public static string Label_host_sku_type_xe_enterprise {
get {
@ -1159,7 +1177,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ Express Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Express Edition.
/// </summary>
public static string Label_host_sku_type_xe_express {
get {
@ -1168,7 +1186,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix @BRANDING_PRODUCT_BRAND@ Server Edition.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Server Edition.
/// </summary>
public static string Label_host_sku_type_xe_server {
get {
@ -1240,7 +1258,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Citrix StorageLink configuration.
/// Looks up a localized string similar to @BRANDING_COMPANY_NAME_SHORT@ StorageLink configuration.
/// </summary>
public static string Label_host_system_status_CVSM {
get {
@ -3924,7 +3942,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to The @BRANDING_PRODUCT_BRAND@ license you are using does not allow you to use the VMPR feature. VMPR is available in Citrix @BRANDING_PRODUCT_BRAND@ Advanced Edition or higher..
/// Looks up a localized string similar to The @BRANDING_PRODUCT_BRAND@ license you are using does not allow you to use the VMPR feature. VMPR is available in @BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Advanced Edition or higher..
/// </summary>
public static string Message_body_vmpp_license_error {
get {

6
XenModel/FriendlyNames.resx
View File

@ -1841,4 +1841,10 @@
<data name="Label-host.system_status-xenvm" xml:space="preserve">
<value>Volume manager logs</value>
</data>
<data name="Label-host.edition-premium" xml:space="preserve">
<value>@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Premium Edition</value>
</data>
<data name="Label-host.edition-basic" xml:space="preserve">
<value>@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Basic Edition</value>
</data>
</root>

6
XenModel/FriendlyNames.zh-CN.resx
View File

@ -1742,4 +1742,10 @@
<data name="Label-host.edition-desktop-plus" xml:space="preserve">
<value>@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Desktop+ Edition</value>
</data>
<data name="Label-host.edition-premium" xml:space="preserve">
<value>@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Premium Edition</value>
</data>
<data name="Label-host.edition-basic" xml:space="preserve">
<value>@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_PRODUCT_BRAND@ Basic Edition</value>
</data>
</root>

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

@ -59,7 +59,8 @@ namespace XenAPI
EnterprisePerUser, // Added in Creedence (enterprise-per-user)
StandardPerSocket, // Added in Creedence (standard-per-socket)
Desktop, // Added in Creedence (desktop)
DesktopPlus // Added in Creedence (desktop-plus)
DesktopPlus, // Added in Creedence (desktop-plus)
Premium // Added in Indigo (premium)
}
public static string LicenseServerWebConsolePort = "8082";
@ -99,6 +100,10 @@ namespace XenAPI
return Edition.Desktop;
case "desktop-plus":
return Edition.DesktopPlus;
case "basic":
return Edition.Free;
case "premium":
return Edition.Premium;
default:
return Edition.Free;
}
@ -148,6 +153,8 @@ namespace XenAPI
return "desktop";
case Edition.DesktopPlus:
return "desktop-plus";
case Edition.Premium:
return "premium";
default:
return "free";
}